[media] rc-core: use ir_raw_event_store_with_filter in winbond-cir

Using ir_raw_event_store_with_filter() saves about 20 lines of code.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index c42a8ed36c92fbcfb685aeea0054f315a1d46b1d..5d06b899e85959a97e75fea8478b74897f36a0ef 100644 (file)
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -330,60 +330,38 @@ wbcir_to_rc6cells(u8 val)
  *****************************************************************************/
 
 static void
-wbcir_irq_rx(struct wbcir_data *data, struct pnp_dev *device)
+wbcir_idle_rx(struct rc_dev *dev, bool idle)
 {
-       u8 irdata[8];
-       bool disable = true;
-       unsigned int i;
+       struct wbcir_data *data = dev->priv;
 
-       if (data->rxstate == WBCIR_RXSTATE_INACTIVE) {
+       if (!idle && data->rxstate == WBCIR_RXSTATE_INACTIVE) {
                data->rxstate = WBCIR_RXSTATE_ACTIVE;
                led_trigger_event(data->rxtrigger, LED_FULL);
        }
 
-       /* Since RXHDLEV is set, at least 8 bytes are in the FIFO */
-       insb(data->sbase + WBCIR_REG_SP3_RXDATA, &irdata[0], 8);
-
-       for (i = 0; i < 8; i++) {
-               u8 pulse;
-               u32 duration;
+       if (idle && data->rxstate != WBCIR_RXSTATE_INACTIVE)
+               /* Tell hardware to go idle by setting RXINACTIVE */
+               outb(WBCIR_RX_DISABLE, data->sbase + WBCIR_REG_SP3_ASCR);
+}
 
-               if (irdata[i] != 0xFF && irdata[i] != 0x00)
-                       disable = false;
+static void
+wbcir_irq_rx(struct wbcir_data *data, struct pnp_dev *device)
+{
+       u8 irdata;
+       DEFINE_IR_RAW_EVENT(rawir);
 
+       /* Since RXHDLEV is set, at least 8 bytes are in the FIFO */
+       while (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_AVAIL) {
+               irdata = inb(data->sbase + WBCIR_REG_SP3_RXDATA);
                if (data->rxstate == WBCIR_RXSTATE_ERROR)
                        continue;
-
-               pulse = irdata[i] & 0x80 ? false : true;
-               duration = (irdata[i] & 0x7F) * 10000; /* ns */
-
-               if (data->rxev.pulse != pulse) {
-                       if (data->rxev.duration != 0) {
-                               ir_raw_event_store(data->dev, &data->rxev);
-                               data->rxev.duration = 0;
-                       }
-
-                       data->rxev.pulse = pulse;
-               }
-
-               data->rxev.duration += duration;
+               rawir.pulse = irdata & 0x80 ? false : true;
+               rawir.duration = US_TO_NS((irdata & 0x7F) * 10);
+               ir_raw_event_store_with_filter(data->dev, &rawir);
        }
 
-       if (disable) {
-               if (data->rxev.duration != 0 &&
-                   data->rxstate != WBCIR_RXSTATE_ERROR) {
-                       ir_raw_event_store(data->dev, &data->rxev);
-                       data->rxev.duration = 0;
-               }
-
-               /* Set RXINACTIVE */
-               outb(WBCIR_RX_DISABLE, data->sbase + WBCIR_REG_SP3_ASCR);
-
-               /* Drain the FIFO */
-               while (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_AVAIL)
-                       inb(data->sbase + WBCIR_REG_SP3_RXDATA);
-
-               ir_raw_event_reset(data->dev);
+       /* Check if we should go idle */
+       if (data->dev->idle) {
                led_trigger_event(data->rxtrigger, LED_OFF);
                data->rxstate = WBCIR_RXSTATE_INACTIVE;
        }
@@ -1088,6 +1066,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
        data->dev->input_id.product = WBCIR_ID_FAMILY;
        data->dev->input_id.version = WBCIR_ID_CHIP;
        data->dev->map_name = RC_MAP_RC6_MCE;
+       data->dev->s_idle = wbcir_idle_rx;
        data->dev->s_tx_mask = wbcir_txmask;
        data->dev->s_tx_carrier = wbcir_txcarrier;
        data->dev->tx_ir = wbcir_tx;