summaryrefslogtreecommitdiff
path: root/drivers/media/video/bt8xx/bttv-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-17 19:53:11 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 13:16:50 +0300
commitca86674b8a93ea11c4bb6f4dd0113b1adf1fa841 (patch)
tree1f51d1aafa28121856b033516a00998a632e2864 /drivers/media/video/bt8xx/bttv-input.c
parent6bda96447cef24fbf97a798b1ea664224d5fdc25 (diff)
downloadlinux-ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841.tar.xz
[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>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c16
1 files changed, 8 insertions, 8 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);