[media] Rename all public generic RC functions from ir_ to rc_

Those functions are not InfraRed specific. So, rename them to properly
reflect it.

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

5 files changed, 24 insertions, 24 deletions

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index e4df7f85f9df..773ee6a8eed4 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -70,14 +70,14 @@ static void ir_handle_key(struct bttv *btv)
 
         if ((ir->mask_keydown && (gpio & ir->mask_keydown)) ||
             (ir->mask_keyup   && !(gpio & ir->mask_keyup))) {
-                ir_keydown_notimeout(ir->dev, data, 0);
+                rc_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_keydown_notimeout(ir->dev, data, 0);
+                        rc_keydown_notimeout(ir->dev, data, 0);
 
-                ir_keyup(ir->dev);
+                rc_keyup(ir->dev);
         }
 }
 
@@ -100,9 +100,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
                         gpio, data,
                         (gpio & ir->mask_keyup) ? " up" : "up/down");
 
-                ir_keydown_notimeout(ir->dev, data, 0);
+                rc_keydown_notimeout(ir->dev, data, 0);
                 if (keyup)
-                        ir_keyup(ir->dev);
+                        rc_keyup(ir->dev);
         } else {
                 if ((ir->last_gpio & 1 << 31) == keyup)
                         return;
@@ -112,9 +112,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
                         (gpio & ir->mask_keyup) ? " up" : "down");
 
                 if (keyup)
-                        ir_keyup(ir->dev);
+                        rc_keyup(ir->dev);
                 else
-                        ir_keydown_notimeout(ir->dev, data, 0);
+                        rc_keydown_notimeout(ir->dev, data, 0);
         }
 
         ir->last_gpio = data | keyup;
@@ -232,7 +232,7 @@ void bttv_rc5_timer_end(unsigned long data)
                         u32 instr = RC5_INSTR(rc5);
 
                         /* Good code */
-                        ir_keydown(ir->dev, instr, toggle);
+                        rc_keydown(ir->dev, instr, toggle);
                         dprintk(KERN_INFO DEVNAME ":"
                                 " instruction %x, toggle %x\n",
                                 instr, toggle);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index a73033846fce..cfeba4c08715 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -123,26 +123,26 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
                 data = (data << 4) | ((gpio_key & 0xf0) >> 4);
 
-                ir_keydown(ir->dev, data, 0);
+                rc_keydown(ir->dev, data, 0);
 
         } else if (ir->mask_keydown) {
                 /* bit set on keydown */
                 if (gpio & ir->mask_keydown)
-                        ir_keydown_notimeout(ir->dev, data, 0);
+                        rc_keydown_notimeout(ir->dev, data, 0);
                 else
-                        ir_keyup(ir->dev);
+                        rc_keyup(ir->dev);
 
         } else if (ir->mask_keyup) {
                 /* bit cleared on keydown */
                 if (0 == (gpio & ir->mask_keyup))
-                        ir_keydown_notimeout(ir->dev, data, 0);
+                        rc_keydown_notimeout(ir->dev, data, 0);
                 else
-                        ir_keyup(ir->dev);
+                        rc_keyup(ir->dev);
 
         } else {
                 /* can't distinguish keydown/up :-/ */
-                ir_keydown_notimeout(ir->dev, data, 0);
-                ir_keyup(ir->dev);
+                rc_keydown_notimeout(ir->dev, data, 0);
+                rc_keyup(ir->dev);
         }
 }
 
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index b7d3999f0417..e32eb38564e6 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -297,12 +297,12 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir)
                         poll_result.toggle_bit, poll_result.read_count,
                         poll_result.rc_address, poll_result.rc_data[0]);
                 if (ir->full_code)
-                        ir_keydown(ir->rc,
+                        rc_keydown(ir->rc,
                                    poll_result.rc_address << 8 |
                                    poll_result.rc_data[0],
                                    poll_result.toggle_bit);
                 else
-                        ir_keydown(ir->rc,
+                        rc_keydown(ir->rc,
                                    poll_result.rc_data[0],
                                    poll_result.toggle_bit);
 
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 83662a4ff73c..c77ea53f50d7 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -252,7 +252,7 @@ static void ir_key_poll(struct IR_i2c *ir)
         }
 
         if (rc)
-                ir_keydown(ir->rc, ir_key, 0);
+                rc_keydown(ir->rc, ir_key, 0);
 }
 
 static void ir_work(struct work_struct *work)
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 900e7985d9b3..cd39aea30389 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -89,25 +89,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_keyup(ir->dev);
+                        rc_keyup(ir->dev);
                 else
-                        ir_keydown_notimeout(ir->dev, data, 0);
+                        rc_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_keydown_notimeout(ir->dev, data, 0);
+                        rc_keydown_notimeout(ir->dev, data, 0);
                 } else {
-                        ir_keyup(ir->dev);
+                        rc_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_keydown_notimeout(ir->dev, data, 0);
-                        ir_keyup(ir->dev);
+                        rc_keydown_notimeout(ir->dev, data, 0);
+                        rc_keyup(ir->dev);
                 }
         }