[media] ir-core: remove remaining users of the ir-functions keyhandlers

This patch removes the remaining usages of the ir_input_nokey() and
ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c
by using the corresponding functionality in ir-core instead.

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

5 files changed, 28 insertions, 68 deletions

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 6bf05a7dc5f9..eb71c3ae36de 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -38,8 +38,6 @@ module_param(repeat_period, int, 0644);
 
 static int ir_rc5_remote_gap = 885;
 module_param(ir_rc5_remote_gap, int, 0644);
-static int ir_rc5_key_timeout = 200;
-module_param(ir_rc5_key_timeout, int, 0644);
 
 #undef dprintk
 #define dprintk(arg...) do {    \
@@ -74,18 +72,17 @@ static void ir_handle_key(struct bttv *btv)
                 (gpio & ir->mask_keydown) ? " down" : "",
                 (gpio & ir->mask_keyup)   ? " up"   : "");
 
-        if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
-            (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
-                ir_input_keydown(ir->dev, &ir->ir, data);
+        if ((ir->mask_keydown && (gpio & ir->mask_keydown)) ||
+            (ir->mask_keyup   && !(gpio & ir->mask_keyup))) {
+                ir_keydown_notimeout(ir->dev, data, 0);
         } else {
                 /* HACK: Probably, ir->mask_keydown is missing
                    for this board */
                 if (btv->c.type == BTTV_BOARD_WINFAST2000)
-                        ir_input_keydown(ir->dev, &ir->ir, data);
+                        ir_keydown_notimeout(ir->dev, data, 0);
 
-                ir_input_nokey(ir->dev,&ir->ir);
+                ir_keyup(ir->dev);
         }
-
 }
 
 static void ir_enltv_handle_key(struct bttv *btv)
@@ -107,9 +104,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
                         gpio, data,
                         (gpio & ir->mask_keyup) ? " up" : "up/down");
 
-                ir_input_keydown(ir->dev, &ir->ir, data);
+                ir_keydown_notimeout(ir->dev, data, 0);
                 if (keyup)
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        ir_keyup(ir->dev);
         } else {
                 if ((ir->last_gpio & 1 << 31) == keyup)
                         return;
@@ -119,9 +116,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
                         (gpio & ir->mask_keyup) ? " up" : "down");
 
                 if (keyup)
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        ir_keyup(ir->dev);
                 else
-                        ir_input_keydown(ir->dev, &ir->ir, data);
+                        ir_keydown_notimeout(ir->dev, data, 0);
         }
 
         ir->last_gpio = data | keyup;
@@ -215,14 +212,9 @@ static void bttv_ir_start(struct bttv *btv, struct card_ir *ir)
                 init_timer(&ir->timer_end);
                 ir->timer_end.function = ir_rc5_timer_end;
                 ir->timer_end.data = (unsigned long)ir;
-
-                init_timer(&ir->timer_keyup);
-                ir->timer_keyup.function = ir_rc5_timer_keyup;
-                ir->timer_keyup.data = (unsigned long)ir;
                 ir->shift_by = 1;
                 ir->start = 3;
                 ir->addr = 0x0;
-                ir->rc5_key_timeout = ir_rc5_key_timeout;
                 ir->rc5_remote_gap = ir_rc5_remote_gap;
         }
 }
@@ -290,7 +282,6 @@ void __devinit init_bttv_i2c_ir(struct bttv *btv)
                 btv->init_data.name = "PV951";
                 btv->init_data.get_key = get_key_pv951;
                 btv->init_data.ir_codes = RC_MAP_PV951;
-                btv->init_data.type = IR_TYPE_OTHER;
                 info.addr = 0x4b;
                 break;
         default:
@@ -327,7 +318,6 @@ int bttv_input_init(struct bttv *btv)
         struct card_ir *ir;
         char *ir_codes = NULL;
         struct input_dev *input_dev;
-        u64 ir_type = IR_TYPE_OTHER;
         int err = -ENOMEM;
 
         if (!btv->has_remote)
@@ -448,10 +438,6 @@ int bttv_input_init(struct bttv *btv)
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(btv->c.pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type);
-        if (err < 0)
-                goto err_out_free;
-
         input_dev->name = ir->name;
         input_dev->phys = ir->phys;
         input_dev->id.bustype = BUS_PCI;
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index d1e26a448ed2..157285b434c9 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -305,7 +305,6 @@ struct bttv_pll_info {
 /* for gpio-connected remote control */
 struct bttv_input {
         struct input_dev      *dev;
-        struct ir_input_state ir;
         char                  name[32];
         char                  phys[32];
         u32                   mask_keycode;
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 436ace8196a5..564e3cb29c4d 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -131,16 +131,21 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
         } else if (ir->mask_keydown) {
                 /* bit set on keydown */
                 if (gpio & ir->mask_keydown)
-                        ir_keydown(ir->input, data, 0);
+                        ir_keydown_notimeout(ir->input, data, 0);
+                else
+                        ir_keyup(ir->input);
 
         } else if (ir->mask_keyup) {
                 /* bit cleared on keydown */
                 if (0 == (gpio & ir->mask_keyup))
-                        ir_keydown(ir->input, data, 0);
+                        ir_keydown_notimeout(ir->input, data, 0);
+                else
+                        ir_keyup(ir->input);
 
         } else {
                 /* can't distinguish keydown/up :-/ */
-                ir_keydown(ir->input, data, 0);
+                ir_keydown_notimeout(ir->input, data, 0);
+                ir_keyup(ir->input);
         }
 }
 
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index ce4a75375909..a78883a6e0e7 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -269,7 +269,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         char *ir_codes = NULL;
         const char *name = NULL;
-        u64 ir_type = 0;
+        u64 ir_type = IR_TYPE_UNKNOWN;
         struct IR_i2c *ir;
         struct input_dev *input_dev;
         struct i2c_adapter *adap = client->adapter;
@@ -383,7 +383,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  dev_name(&client->dev));
 
         /* init + register input device */
-        ir->ir_type = ir_type;
         input_dev->id.bustype = BUS_I2C;
         input_dev->name       = ir->name;
         input_dev->phys       = ir->phys;
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index b6c682f0acec..3e37593a328f 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -44,8 +44,6 @@ MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=g
 
 static int ir_rc5_remote_gap = 885;
 module_param(ir_rc5_remote_gap, int, 0644);
-static int ir_rc5_key_timeout = 115;
-module_param(ir_rc5_key_timeout, int, 0644);
 
 static int repeat_delay = 500;
 module_param(repeat_delay, int, 0644);
@@ -70,7 +68,6 @@ static int saa7134_rc5_irq(struct saa7134_dev *dev);
 static int saa7134_nec_irq(struct saa7134_dev *dev);
 static int saa7134_raw_decode_irq(struct saa7134_dev *dev);
 static void nec_task(unsigned long data);
-static void saa7134_nec_timer(unsigned long data);
 
 /* -------------------- GPIO generic keycode builder -------------------- */
 
@@ -104,25 +101,25 @@ static int build_key(struct saa7134_dev *dev)
         switch (dev->board) {
         case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
                 if (data == ir->mask_keycode)
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        ir_keyup(ir->dev);
                 else
-                        ir_input_keydown(ir->dev, &ir->ir, data);
+                        ir_keydown_notimeout(ir->dev, data, 0);
                 return 0;
         }
 
         if (ir->polling) {
                 if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
                     (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
-                        ir_input_keydown(ir->dev, &ir->ir, data);
+                        ir_keydown_notimeout(ir->dev, data, 0);
                 } else {
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        ir_keyup(ir->dev);
                 }
         }
         else {  /* IRQ driven mode - handle key press and release in one go */
                 if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
                     (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
-                        ir_input_keydown(ir->dev, &ir->ir, data);
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        ir_keydown_notimeout(ir->dev, data, 0);
+                        ir_keyup(ir->dev);
                 }
         }
 
@@ -465,17 +462,11 @@ static int __saa7134_ir_start(void *priv)
                 init_timer(&ir->timer_end);
                 ir->timer_end.function = ir_rc5_timer_end;
                 ir->timer_end.data = (unsigned long)ir;
-                init_timer(&ir->timer_keyup);
-                ir->timer_keyup.function = ir_rc5_timer_keyup;
-                ir->timer_keyup.data = (unsigned long)ir;
                 ir->shift_by = 2;
                 ir->start = 0x2;
                 ir->addr = 0x17;
-                ir->rc5_key_timeout = ir_rc5_key_timeout;
                 ir->rc5_remote_gap = ir_rc5_remote_gap;
         } else if (ir->nec_gpio) {
-                setup_timer(&ir->timer_keyup, saa7134_nec_timer,
-                            (unsigned long)dev);
                 tasklet_init(&ir->tlet, nec_task, (unsigned long)dev);
         } else if (ir->raw_decode) {
                 /* set timer_end for code completion */
@@ -596,7 +587,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         int nec_gpio     = 0;
         int raw_decode   = 0;
         int allow_protocol_change = 0;
-        u64 ir_type = IR_TYPE_OTHER;
         int err;
 
         if (dev->has_remote != SAA7134_REMOTE_GPIO)
@@ -871,10 +861,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 ir->props.change_protocol = saa7134_ir_change_protocol;
         }
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type);
-        if (err < 0)
-                goto err_out_free;
-
         input_dev->name = ir->name;
         input_dev->phys = ir->phys;
         input_dev->id.bustype = BUS_PCI;
@@ -1092,20 +1078,6 @@ static int saa7134_rc5_irq(struct saa7134_dev *dev)
         return 1;
 }
 
-/* On NEC protocol, One has 2.25 ms, and zero has 1.125 ms
-   The first pulse (start) has 9 + 4.5 ms
- */
-
-static void saa7134_nec_timer(unsigned long data)
-{
-        struct saa7134_dev *dev = (struct saa7134_dev *) data;
-        struct card_ir *ir = dev->remote;
-
-        dprintk("Cancel key repeat\n");
-
-        ir_input_nokey(ir->dev, &ir->ir);
-}
-
 static void nec_task(unsigned long data)
 {
         struct saa7134_dev *dev = (struct saa7134_dev *) data;
@@ -1194,12 +1166,11 @@ static void nec_task(unsigned long data)
                 dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n",
                          ir->code, ircode, not_code);
 
-                ir_input_keydown(ir->dev, &ir->ir, ir->code);
-        } else
+                ir_keydown(ir->dev, ir->code, 0);
+        } else {
                 dprintk("Repeat last key\n");
-
-        /* Keep repeating the last key */
-        mod_timer(&ir->timer_keyup, jiffies + msecs_to_jiffies(150));
+                ir_repeat(ir->dev);
+        }
 
         saa_setl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18_P);
 }