V4L/DVB (13533): ir: use dynamic tables, instead of static ones

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

7 files changed, 19 insertions, 22 deletions

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index ebd51afe8761..62408ccf34c8 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -73,12 +73,12 @@ static void ir_handle_key(struct bttv *btv)
 
         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,data);
+                ir_input_keydown(ir->dev, &ir->ir, data);
         } 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, data);
+                        ir_input_keydown(ir->dev, &ir->ir, data);
 
                 ir_input_nokey(ir->dev,&ir->ir);
         }
@@ -104,7 +104,7 @@ 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, data);
+                ir_input_keydown(ir->dev, &ir->ir, data);
                 if (keyup)
                         ir_input_nokey(ir->dev, &ir->ir);
         } else {
@@ -118,7 +118,7 @@ static void ir_enltv_handle_key(struct bttv *btv)
                 if (keyup)
                         ir_input_nokey(ir->dev, &ir->ir);
                 else
-                        ir_input_keydown(ir->dev, &ir->ir, data, data);
+                        ir_input_keydown(ir->dev, &ir->ir, data);
         }
 
         ir->last_gpio = data | keyup;
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
index 48f22fa38e6c..58dd39bc6787 100644
--- a/drivers/media/video/cx231xx/cx231xx-input.c
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -126,8 +126,7 @@ static void cx231xx_ir_handle_key(struct cx231xx_IR *ir)
 
         if (do_sendkey) {
                 dprintk("sending keypress\n");
-                ir_input_keydown(ir->input, &ir->ir, poll_result.rc_data[0],
-                                 poll_result.rc_data[0]);
+                ir_input_keydown(ir->input, &ir->ir, poll_result.rc_data[0]);
                 ir_input_nokey(ir->input, &ir->ir);
         }
 
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index f000ed787d4e..fea882d1fbcb 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -94,8 +94,7 @@ static void cx23885_input_process_raw_rc5(struct cx23885_dev *dev)
             RC5_START(ir_input->last_rc5) == 0) {
                 /* This keypress is differnet: not an auto repeat */
                 ir_input_nokey(ir_input->dev, &ir_input->ir);
-                ir_input_keydown(ir_input->dev, &ir_input->ir,
-                                 command, ir_input->code);
+                ir_input_keydown(ir_input->dev, &ir_input->ir, command);
         }
         ir_input->last_rc5 = rc5;
 
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 47c03019357d..7b2066415d7e 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -118,13 +118,13 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
                 data = (data << 4) | ((gpio_key & 0xf0) >> 4);
 
-                ir_input_keydown(ir->input, &ir->ir, data, data);
+                ir_input_keydown(ir->input, &ir->ir, data);
                 ir_input_nokey(ir->input, &ir->ir);
 
         } else if (ir->mask_keydown) {
                 /* bit set on keydown */
                 if (gpio & ir->mask_keydown) {
-                        ir_input_keydown(ir->input, &ir->ir, data, data);
+                        ir_input_keydown(ir->input, &ir->ir, data);
                 } else {
                         ir_input_nokey(ir->input, &ir->ir);
                 }
@@ -132,14 +132,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
         } else if (ir->mask_keyup) {
                 /* bit cleared on keydown */
                 if (0 == (gpio & ir->mask_keyup)) {
-                        ir_input_keydown(ir->input, &ir->ir, data, data);
+                        ir_input_keydown(ir->input, &ir->ir, data);
                 } else {
                         ir_input_nokey(ir->input, &ir->ir);
                 }
 
         } else {
                 /* can't distinguish keydown/up :-/ */
-                ir_input_keydown(ir->input, &ir->ir, data, data);
+                ir_input_keydown(ir->input, &ir->ir, data);
                 ir_input_nokey(ir->input, &ir->ir);
         }
 }
@@ -487,7 +487,7 @@ void cx88_ir_irq(struct cx88_core *core)
 
                 ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f);
 
-                ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f, (ircode >> 16) & 0xff);
+                ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         case CX88_BOARD_HAUPPAUGE:
@@ -524,7 +524,7 @@ void cx88_ir_irq(struct cx88_core *core)
                 if ( dev != 0x1e && dev != 0x1f )
                         /* not a hauppauge remote */
                         break;
-                ir_input_keydown(ir->input, &ir->ir, code, ircode);
+                ir_input_keydown(ir->input, &ir->ir, code);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
@@ -532,7 +532,7 @@ void cx88_ir_irq(struct cx88_core *core)
                 ir_dprintk("biphase decoded: %x\n", ircode);
                 if ((ircode & 0xfffff000) != 0x3000)
                         break;
-                ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f, ircode);
+                ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         }
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 7a0fe3816e3d..990ee04bbd5e 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -282,8 +282,7 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir)
 
         if (do_sendkey) {
                 dprintk("sending keypress\n");
-                ir_input_keydown(ir->input, &ir->ir, poll_result.rc_data[0],
-                                 poll_result.rc_data[0]);
+                ir_input_keydown(ir->input, &ir->ir, poll_result.rc_data[0]);
                 ir_input_nokey(ir->input, &ir->ir);
         }
 
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index aec36660987d..9c6d0ae58b1f 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -275,7 +275,7 @@ static void ir_key_poll(struct IR_i2c *ir)
         if (0 == rc) {
                 ir_input_nokey(ir->input, &ir->ir);
         } else {
-                ir_input_keydown(ir->input, &ir->ir, ir_key, ir_raw);
+                ir_input_keydown(ir->input, &ir->ir, ir_key);
         }
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index f658f2513992..439f3d54d009 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -102,14 +102,14 @@ static int build_key(struct saa7134_dev *dev)
                 if (data == ir->mask_keycode)
                         ir_input_nokey(ir->dev, &ir->ir);
                 else
-                        ir_input_keydown(ir->dev, &ir->ir, data, data);
+                        ir_input_keydown(ir->dev, &ir->ir, data);
                 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, data);
+                        ir_input_keydown(ir->dev, &ir->ir, data);
                 } else {
                         ir_input_nokey(ir->dev, &ir->ir);
                 }
@@ -117,7 +117,7 @@ static int build_key(struct saa7134_dev *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, data);
+                        ir_input_keydown(ir->dev, &ir->ir, data);
                         ir_input_nokey(ir->dev, &ir->ir);
                 }
         }
@@ -938,7 +938,7 @@ 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, ir->code);
+                ir_input_keydown(ir->dev, &ir->ir, ir->code);
         } else
                 dprintk("Repeat last key\n");