Linux 6.9-rc5

[sfrench/cifs-2.6.git] / drivers / media / pci / smipcie / smipcie-ir.c

diff --git a/drivers/media/pci/smipcie/smipcie-ir.c b/drivers/media/pci/smipcie/smipcie-ir.c
index d292cdfb36719765f3558f6544d2c5b3cc8ac7f0..c0604d9c70119abbef4e3c032921722766cb5afd 100644 (file)
--- a/drivers/media/pci/smipcie/smipcie-ir.c
+++ b/drivers/media/pci/smipcie/smipcie-ir.c
@@ -1,17 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * SMI PCIe driver for DVBSky cards.
  *
  * Copyright (C) 2014 Max nibble <nibble.max@gmail.com>
- *
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
  */
 
 #include "smipcie.h"
@@ -69,39 +60,44 @@ static void smi_ir_decode(struct smi_rc *ir)
 {
        struct smi_dev *dev = ir->dev;
        struct rc_dev *rc_dev = ir->rc_dev;
-       u32 dwIRControl, dwIRData;
-       u8 index, ucIRCount, readLoop;
+       u32 control, data;
+       u8 index, ir_count, read_loop;
+
+       control = smi_read(IR_Init_Reg);
+
+       dev_dbg(&rc_dev->dev, "ircontrol: 0x%08x\n", control);
 
-       dwIRControl = smi_read(IR_Init_Reg);
+       if (control & rbIRVld) {
+               ir_count = (u8)smi_read(IR_Data_Cnt);
 
-       if (dwIRControl & rbIRVld) {
-               ucIRCount = (u8) smi_read(IR_Data_Cnt);
+               dev_dbg(&rc_dev->dev, "ircount %d\n", ir_count);
 
-               readLoop = ucIRCount/4;
-               if (ucIRCount % 4)
-                       readLoop += 1;
-               for (index = 0; index < readLoop; index++) {
-                       dwIRData = smi_read(IR_DATA_BUFFER_BASE + (index * 4));
+               read_loop = ir_count / 4;
+               if (ir_count % 4)
+                       read_loop += 1;
+               for (index = 0; index < read_loop; index++) {
+                       data = smi_read(IR_DATA_BUFFER_BASE + (index * 4));
+                       dev_dbg(&rc_dev->dev, "IRData 0x%08x\n", data);
 
-                       ir->irData[index*4 + 0] = (u8)(dwIRData);
-                       ir->irData[index*4 + 1] = (u8)(dwIRData >> 8);
-                       ir->irData[index*4 + 2] = (u8)(dwIRData >> 16);
-                       ir->irData[index*4 + 3] = (u8)(dwIRData >> 24);
+                       ir->irData[index * 4 + 0] = (u8)(data);
+                       ir->irData[index * 4 + 1] = (u8)(data >> 8);
+                       ir->irData[index * 4 + 2] = (u8)(data >> 16);
+                       ir->irData[index * 4 + 3] = (u8)(data >> 24);
                }
-               smi_raw_process(rc_dev, ir->irData, ucIRCount);
-               smi_set(IR_Init_Reg, rbIRVld);
+               smi_raw_process(rc_dev, ir->irData, ir_count);
        }
 
-       if (dwIRControl & rbIRhighidle) {
+       if (control & rbIRhighidle) {
                struct ir_raw_event rawir = {};
 
+               dev_dbg(&rc_dev->dev, "high idle\n");
+
                rawir.pulse = 0;
-               rawir.duration = US_TO_NS(SMI_SAMPLE_PERIOD *
-                                         SMI_SAMPLE_IDLEMIN);
+               rawir.duration = SMI_SAMPLE_PERIOD * SMI_SAMPLE_IDLEMIN;
                ir_raw_event_store_with_filter(rc_dev, &rawir);
-               smi_set(IR_Init_Reg, rbIRhighidle);
        }
 
+       smi_set(IR_Init_Reg, rbIRVld);
        ir_raw_event_handle(rc_dev);
 }
 
@@ -160,8 +156,8 @@ int smi_ir_init(struct smi_dev *dev)
        rc_dev->dev.parent = &dev->pci_dev->dev;
 
        rc_dev->map_name = dev->info->rc_map;
-       rc_dev->timeout = MS_TO_NS(100);
-       rc_dev->rx_resolution = US_TO_NS(SMI_SAMPLE_PERIOD);
+       rc_dev->timeout = SMI_SAMPLE_PERIOD * SMI_SAMPLE_IDLEMIN;
+       rc_dev->rx_resolution = SMI_SAMPLE_PERIOD;
 
        ir->rc_dev = rc_dev;
        ir->dev = dev;
@@ -183,7 +179,7 @@ void smi_ir_exit(struct smi_dev *dev)
        struct smi_rc *ir = &dev->ir;
        struct rc_dev *rc_dev = ir->rc_dev;
 
-       smi_ir_stop(ir);
        rc_unregister_device(rc_dev);
+       smi_ir_stop(ir);
        ir->rc_dev = NULL;
 }