aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/mantis/mantis_input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-17 13:56:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:52 -0500
commitd100e659b61a735c3343b3d82c1c009b04072cdd (patch)
treed80eedc6a9a51787b4fd2307977b9886a316f122 /drivers/media/dvb/mantis/mantis_input.c
parent2f4f58d689dd71dea67407b74405a3c43e797cb1 (diff)
[media] rc: use rc_map_ prefix for all rc map tables
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_input.c')
-rw-r--r--drivers/media/dvb/mantis/mantis_input.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index 572929a2cd6f..db6d54d3fec0 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -95,7 +95,7 @@ static struct rc_map_table mantis_ir_table[] = {
95 { 0x00, KEY_BLUE }, 95 { 0x00, KEY_BLUE },
96}; 96};
97 97
98static struct rc_keymap ir_mantis_map = { 98static struct rc_map_list ir_mantis_map = {
99 .map = { 99 .map = {
100 .scan = mantis_ir_table, 100 .scan = mantis_ir_table,
101 .size = ARRAY_SIZE(mantis_ir_table), 101 .size = ARRAY_SIZE(mantis_ir_table),
@@ -109,7 +109,7 @@ int mantis_input_init(struct mantis_pci *mantis)
109 struct rc_dev *dev; 109 struct rc_dev *dev;
110 int err; 110 int err;
111 111
112 err = ir_register_map(&ir_mantis_map); 112 err = rc_map_register(&ir_mantis_map);
113 if (err) 113 if (err)
114 goto out; 114 goto out;
115 115
@@ -145,7 +145,7 @@ int mantis_input_init(struct mantis_pci *mantis)
145out_dev: 145out_dev:
146 rc_free_device(dev); 146 rc_free_device(dev);
147out_map: 147out_map:
148 ir_unregister_map(&ir_mantis_map); 148 rc_map_unregister(&ir_mantis_map);
149out: 149out:
150 return err; 150 return err;
151} 151}
@@ -153,7 +153,7 @@ out:
153int mantis_exit(struct mantis_pci *mantis) 153int mantis_exit(struct mantis_pci *mantis)
154{ 154{
155 rc_unregister_device(mantis->rc); 155 rc_unregister_device(mantis->rc);
156 ir_unregister_map(&ir_mantis_map); 156 rc_map_unregister(&ir_mantis_map);
157 return 0; 157 return 0;
158} 158}
159 159