1 files changed, 27 insertions, 27 deletions

diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index 774df88dc6e3..2c307ba0d28b 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -73,8 +73,8 @@
                 "Please see linux/Documentation/dvb/ for more details " \
                 "on firmware-problems."
 
-struct ir_codes_dvb_usb_table_table {
-        struct ir_scancode *rc_keys;
+struct rc_map_dvb_usb_table_table {
+        struct rc_map_table *rc_keys;
         int rc_keys_size;
 };
 
@@ -948,7 +948,7 @@ static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static struct ir_scancode ir_codes_dw210x_table[] = {
+static struct rc_map_table rc_map_dw210x_table[] = {
         { 0xf80a, KEY_Q },              /*power*/
         { 0xf80c, KEY_M },              /*mute*/
         { 0xf811, KEY_1 },
@@ -982,7 +982,7 @@ static struct ir_scancode ir_codes_dw210x_table[] = {
         { 0xf81b, KEY_B },              /*recall*/
 };
 
-static struct ir_scancode ir_codes_tevii_table[] = {
+static struct rc_map_table rc_map_tevii_table[] = {
         { 0xf80a, KEY_POWER },
         { 0xf80c, KEY_MUTE },
         { 0xf811, KEY_1 },
@@ -1032,7 +1032,7 @@ static struct ir_scancode ir_codes_tevii_table[] = {
         { 0xf858, KEY_SWITCHVIDEOMODE },
 };
 
-static struct ir_scancode ir_codes_tbs_table[] = {
+static struct rc_map_table rc_map_tbs_table[] = {
         { 0xf884, KEY_POWER },
         { 0xf894, KEY_MUTE },
         { 0xf887, KEY_1 },
@@ -1067,16 +1067,16 @@ static struct ir_scancode ir_codes_tbs_table[] = {
         { 0xf89b, KEY_MODE }
 };
 
-static struct ir_codes_dvb_usb_table_table keys_tables[] = {
-        { ir_codes_dw210x_table, ARRAY_SIZE(ir_codes_dw210x_table) },
-        { ir_codes_tevii_table, ARRAY_SIZE(ir_codes_tevii_table) },
-        { ir_codes_tbs_table, ARRAY_SIZE(ir_codes_tbs_table) },
+static struct rc_map_dvb_usb_table_table keys_tables[] = {
+        { rc_map_dw210x_table, ARRAY_SIZE(rc_map_dw210x_table) },
+        { rc_map_tevii_table, ARRAY_SIZE(rc_map_tevii_table) },
+        { rc_map_tbs_table, ARRAY_SIZE(rc_map_tbs_table) },
 };
 
 static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
-        int keymap_size = d->props.rc.legacy.rc_key_map_size;
+        struct rc_map_table *keymap = d->props.rc.legacy.rc_map_table;
+        int keymap_size = d->props.rc.legacy.rc_map_size;
         u8 key[2];
         struct i2c_msg msg = {
                 .addr = DW2102_RC_QUERY,
@@ -1185,14 +1185,14 @@ static int dw2102_load_firmware(struct usb_device *dev,
                 /* init registers */
                 switch (dev->descriptor.idProduct) {
                 case USB_PID_PROF_1100:
-                        s6x0_properties.rc.legacy.rc_key_map = ir_codes_tbs_table;
-                        s6x0_properties.rc.legacy.rc_key_map_size =
-                                        ARRAY_SIZE(ir_codes_tbs_table);
+                        s6x0_properties.rc.legacy.rc_map_table = rc_map_tbs_table;
+                        s6x0_properties.rc.legacy.rc_map_size =
+                                        ARRAY_SIZE(rc_map_tbs_table);
                         break;
                 case USB_PID_TEVII_S650:
-                        dw2104_properties.rc.legacy.rc_key_map = ir_codes_tevii_table;
-                        dw2104_properties.rc.legacy.rc_key_map_size =
-                                        ARRAY_SIZE(ir_codes_tevii_table);
+                        dw2104_properties.rc.legacy.rc_map_table = rc_map_tevii_table;
+                        dw2104_properties.rc.legacy.rc_map_size =
+                                        ARRAY_SIZE(rc_map_tevii_table);
                 case USB_PID_DW2104:
                         reset = 1;
                         dw210x_op_rw(dev, 0xc4, 0x0000, 0, &reset, 1,
@@ -1257,8 +1257,8 @@ static struct dvb_usb_device_properties dw2102_properties = {
         .i2c_algo = &dw2102_serit_i2c_algo,
 
         .rc.legacy = {
-                .rc_key_map = ir_codes_dw210x_table,
-                .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+                .rc_map_table = rc_map_dw210x_table,
+                .rc_map_size = ARRAY_SIZE(rc_map_dw210x_table),
                 .rc_interval = 150,
                 .rc_query = dw2102_rc_query,
         },
@@ -1310,8 +1310,8 @@ static struct dvb_usb_device_properties dw2104_properties = {
 
         .i2c_algo = &dw2104_i2c_algo,
         .rc.legacy = {
-                .rc_key_map = ir_codes_dw210x_table,
-                .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+                .rc_map_table = rc_map_dw210x_table,
+                .rc_map_size = ARRAY_SIZE(rc_map_dw210x_table),
                 .rc_interval = 150,
                 .rc_query = dw2102_rc_query,
         },
@@ -1359,8 +1359,8 @@ static struct dvb_usb_device_properties dw3101_properties = {
 
         .i2c_algo = &dw3101_i2c_algo,
         .rc.legacy = {
-                .rc_key_map = ir_codes_dw210x_table,
-                .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+                .rc_map_table = rc_map_dw210x_table,
+                .rc_map_size = ARRAY_SIZE(rc_map_dw210x_table),
                 .rc_interval = 150,
                 .rc_query = dw2102_rc_query,
         },
@@ -1404,8 +1404,8 @@ static struct dvb_usb_device_properties s6x0_properties = {
 
         .i2c_algo = &s6x0_i2c_algo,
         .rc.legacy = {
-                .rc_key_map = ir_codes_tevii_table,
-                .rc_key_map_size = ARRAY_SIZE(ir_codes_tevii_table),
+                .rc_map_table = rc_map_tevii_table,
+                .rc_map_size = ARRAY_SIZE(rc_map_tevii_table),
                 .rc_interval = 150,
                 .rc_query = dw2102_rc_query,
         },
@@ -1468,8 +1468,8 @@ static int dw2102_probe(struct usb_interface *intf,
         /* fill only different fields */
         p7500->firmware = "dvb-usb-p7500.fw";
         p7500->devices[0] = d7500;
-        p7500->rc.legacy.rc_key_map = ir_codes_tbs_table;
-        p7500->rc.legacy.rc_key_map_size = ARRAY_SIZE(ir_codes_tbs_table);
+        p7500->rc.legacy.rc_map_table = rc_map_tbs_table;
+        p7500->rc.legacy.rc_map_size = ARRAY_SIZE(rc_map_tbs_table);
         p7500->adapter->frontend_attach = prof_7500_frontend_attach;
 
         if (0 == dvb_usb_device_init(intf, &dw2102_properties,