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 / af9015.c

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 31c0a0ed39f59b13e7825c63e94d35c52ae747fd..8671ca362c81f858f0a644ddf461c347e7974b80 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1041,13 +1041,13 @@ static int af9015_rc_query(struct dvb_usb_device *d)
                                priv->rc_keycode = buf[12] << 16 |
                                        buf[13] << 8 | buf[14];
                        }
-                       ir_keydown(d->rc_input_dev, priv->rc_keycode, 0);
+                       rc_keydown(d->rc_dev, priv->rc_keycode, 0);
                } else {
                        priv->rc_keycode = 0; /* clear just for sure */
                }
        } else if (priv->rc_repeat != buf[6] || buf[0]) {
                deb_rc("%s: key repeated\n", __func__);
-               ir_keydown(d->rc_input_dev, priv->rc_keycode, 0);
+               rc_keydown(d->rc_dev, priv->rc_keycode, 0);
        } else {
                deb_rc("%s: no key press\n", __func__);
        }
@@ -1344,13 +1344,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
 
                .rc.core = {
-                       .protocol         = IR_TYPE_NEC,
+                       .protocol         = RC_TYPE_NEC,
                        .module_name      = "af9015",
                        .rc_query         = af9015_rc_query,
                        .rc_interval      = AF9015_RC_INTERVAL,
-                       .rc_props = {
-                               .allowed_protos = IR_TYPE_NEC,
-                       },
+                       .allowed_protos   = RC_TYPE_NEC,
                },
 
                .i2c_algo = &af9015_i2c_algo,
@@ -1474,13 +1472,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
 
                .rc.core = {
-                       .protocol         = IR_TYPE_NEC,
+                       .protocol         = RC_TYPE_NEC,
                        .module_name      = "af9015",
                        .rc_query         = af9015_rc_query,
                        .rc_interval      = AF9015_RC_INTERVAL,
-                       .rc_props = {
-                               .allowed_protos = IR_TYPE_NEC,
-                       },
+                       .allowed_protos   = RC_TYPE_NEC,
                },
 
                .i2c_algo = &af9015_i2c_algo,
@@ -1588,13 +1584,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
 
                .rc.core = {
-                       .protocol         = IR_TYPE_NEC,
+                       .protocol         = RC_TYPE_NEC,
                        .module_name      = "af9015",
                        .rc_query         = af9015_rc_query,
                        .rc_interval      = AF9015_RC_INTERVAL,
-                       .rc_props = {
-                               .allowed_protos = IR_TYPE_NEC,
-                       },
+                       .allowed_protos   = RC_TYPE_NEC,
                },
 
                .i2c_algo = &af9015_i2c_algo,