Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / dvb-usb / m920x.c

diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index bdef1a18b664ea22c854646788708c4468b1327b..da9dc91ce910c9e36ad7c1a1aaf6b817d8397a88 100644 (file)
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -142,9 +142,9 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
                goto unlock;
 
-       for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
-               if (rc5_data(&d->props.rc.legacy.rc_key_map[i]) == rc_state[1]) {
-                       *event = d->props.rc.legacy.rc_key_map[i].keycode;
+       for (i = 0; i < d->props.rc.legacy.rc_map_size; i++)
+               if (rc5_data(&d->props.rc.legacy.rc_map_table[i]) == rc_state[1]) {
+                       *event = d->props.rc.legacy.rc_map_table[i].keycode;
 
                        switch(rc_state[0]) {
                        case 0x80:
@@ -589,7 +589,7 @@ static struct m920x_inits pinnacle310e_init[] = {
 };
 
 /* ir keymaps */
-static struct ir_scancode ir_codes_megasky_table[] = {
+static struct rc_map_table rc_map_megasky_table[] = {
        { 0x0012, KEY_POWER },
        { 0x001e, KEY_CYCLEWINDOWS }, /* min/max */
        { 0x0002, KEY_CHANNELUP },
@@ -608,7 +608,7 @@ static struct ir_scancode ir_codes_megasky_table[] = {
        { 0x000e, KEY_COFFEE }, /* "MTS" */
 };
 
-static struct ir_scancode ir_codes_tvwalkertwin_table[] = {
+static struct rc_map_table rc_map_tvwalkertwin_table[] = {
        { 0x0001, KEY_ZOOM }, /* Full Screen */
        { 0x0002, KEY_CAMERA }, /* snapshot */
        { 0x0003, KEY_MUTE },
@@ -628,7 +628,7 @@ static struct ir_scancode ir_codes_tvwalkertwin_table[] = {
        { 0x001e, KEY_VOLUMEUP },
 };
 
-static struct ir_scancode ir_codes_pinnacle310e_table[] = {
+static struct rc_map_table rc_map_pinnacle310e_table[] = {
        { 0x16, KEY_POWER },
        { 0x17, KEY_FAVORITES },
        { 0x0f, KEY_TEXT },
@@ -786,8 +786,8 @@ static struct dvb_usb_device_properties megasky_properties = {
 
        .rc.legacy = {
                .rc_interval      = 100,
-               .rc_key_map       = ir_codes_megasky_table,
-               .rc_key_map_size  = ARRAY_SIZE(ir_codes_megasky_table),
+               .rc_map_table     = rc_map_megasky_table,
+               .rc_map_size      = ARRAY_SIZE(rc_map_megasky_table),
                .rc_query         = m920x_rc_query,
        },
 
@@ -889,8 +889,8 @@ static struct dvb_usb_device_properties tvwalkertwin_properties = {
 
        .rc.legacy = {
                .rc_interval      = 100,
-               .rc_key_map       = ir_codes_tvwalkertwin_table,
-               .rc_key_map_size  = ARRAY_SIZE(ir_codes_tvwalkertwin_table),
+               .rc_map_table     = rc_map_tvwalkertwin_table,
+               .rc_map_size      = ARRAY_SIZE(rc_map_tvwalkertwin_table),
                .rc_query         = m920x_rc_query,
        },
 
@@ -998,8 +998,8 @@ static struct dvb_usb_device_properties pinnacle_pctv310e_properties = {
 
        .rc.legacy = {
                .rc_interval      = 100,
-               .rc_key_map       = ir_codes_pinnacle310e_table,
-               .rc_key_map_size  = ARRAY_SIZE(ir_codes_pinnacle310e_table),
+               .rc_map_table     = rc_map_pinnacle310e_table,
+               .rc_map_size      = ARRAY_SIZE(rc_map_pinnacle310e_table),
                .rc_query         = m920x_rc_query,
        },