summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/zx-irdec.c
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-08-07 16:20:58 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-20 10:02:48 -0400
commit6d741bfed5ed06ed42a16d30f1ed7afdcaf7f092 (patch)
treeba80456506b89d858a91daddde92237b93fabe1c /drivers/media/rc/zx-irdec.c
parenta9a249a2c997506a64eaee22f1458fda893f62a8 (diff)
downloadblackbird-obmc-linux-6d741bfed5ed06ed42a16d30f1ed7afdcaf7f092.tar.gz
blackbird-obmc-linux-6d741bfed5ed06ed42a16d30f1ed7afdcaf7f092.zip
media: rc: rename RC_TYPE_* to RC_PROTO_* and RC_BIT_* to RC_PROTO_BIT_*
RC_TYPE is confusing and it's just the protocol. So rename it. Suggested-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Sean Young <sean@mess.org> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc/zx-irdec.c')
-rw-r--r--drivers/media/rc/zx-irdec.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/rc/zx-irdec.c b/drivers/media/rc/zx-irdec.c
index 9452bac9262c..12d322ec8a29 100644
--- a/drivers/media/rc/zx-irdec.c
+++ b/drivers/media/rc/zx-irdec.c
@@ -54,7 +54,7 @@ static irqreturn_t zx_irdec_irq(int irq, void *dev_id)
u8 address, not_address;
u8 command, not_command;
u32 rawcode, scancode;
- enum rc_type rc_type;
+ enum rc_proto rc_proto;
/* Clear interrupt */
writel(1, irdec->base + ZX_IR_INTSTCLR);
@@ -73,8 +73,8 @@ static irqreturn_t zx_irdec_irq(int irq, void *dev_id)
scancode = ir_nec_bytes_to_scancode(address, not_address,
command, not_command,
- &rc_type);
- rc_keydown(irdec->rcd, rc_type, scancode, 0);
+ &rc_proto);
+ rc_keydown(irdec->rcd, rc_proto, scancode, 0);
done:
return IRQ_HANDLED;
@@ -114,7 +114,8 @@ static int zx_irdec_probe(struct platform_device *pdev)
rcd->input_phys = DRIVER_NAME "/input0";
rcd->input_id.bustype = BUS_HOST;
rcd->map_name = RC_MAP_ZX_IRDEC;
- rcd->allowed_protocols = RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32;
+ rcd->allowed_protocols = RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX |
+ RC_PROTO_BIT_NEC32;
rcd->driver_name = DRIVER_NAME;
rcd->device_name = DRIVER_NAME;
OpenPOWER on IntegriCloud