[media] ir-core: make struct rc_dev the primary interface

This patch merges the ir_input_dev and ir_dev_props structs into a single
struct called rc_dev. The drivers and various functions in rc-core used
by the drivers are also changed to use rc_dev as the primary interface
when dealing with rc-core.

This means that the input_dev is abstracted away from the drivers which
is necessary if we ever want to support multiple input devs per rc device.

The new API is similar to what the input subsystem uses, i.e:
rc_device_alloc()
rc_device_free()
rc_device_register()
rc_device_unregister()

[mchehab@redhat.com: Fix compilation on mceusb and cx231xx, due to merge conflicts]
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

8 files changed, 142 insertions, 160 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 31c0a0ed39f5..8b9ab3002e11 100644
--- 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);
+                        ir_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);
+                ir_keydown(d->rc_dev, priv->rc_keycode, 0);
         } else {
                 deb_rc("%s: no key press\n", __func__);
         }
@@ -1348,9 +1348,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_NEC,
-                        },
+                        .allowed_protos   = IR_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
@@ -1478,9 +1476,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_NEC,
-                        },
+                        .allowed_protos   = IR_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
@@ -1592,9 +1588,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_NEC,
-                        },
+                        .allowed_protos   = IR_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 1759d26bca42..c6e4ba53ad61 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -394,7 +394,7 @@ static int anysee_rc_query(struct dvb_usb_device *d)
 
         if (ircode[0]) {
                 deb_rc("%s: key pressed %02x\n", __func__, ircode[1]);
-                ir_keydown(d->rc_input_dev, 0x08 << 8 | ircode[1], 0);
+                ir_keydown(d->rc_dev, 0x08 << 8 | ircode[1], 0);
         }
 
         return 0;
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h
index c2c9d236ec7e..1e7d780332b5 100644
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -60,7 +60,7 @@ extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
 extern struct i2c_algorithm dib0700_i2c_algo;
 extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
                         struct dvb_usb_device_description **desc, int *cold);
-extern int dib0700_change_protocol(void *priv, u64 ir_type);
+extern int dib0700_change_protocol(struct rc_dev *dev, u64 ir_type);
 
 extern int dib0700_device_count;
 extern int dvb_usb_dib0700_ir_proto;
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index 48397f103d32..3b58f4575689 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -471,9 +471,9 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return dib0700_ctrl_wr(adap->dev, b, 4);
 }
 
-int dib0700_change_protocol(void *priv, u64 ir_type)
+int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
 {
-        struct dvb_usb_device *d = priv;
+        struct dvb_usb_device *d = rc->priv;
         struct dib0700_state *st = d->priv;
         u8 rc_setup[3] = { REQUEST_SET_RC, 0, 0 };
         int new_proto, ret;
@@ -535,7 +535,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
         if (d == NULL)
                 return;
 
-        if (d->rc_input_dev == NULL) {
+        if (d->rc_dev == NULL) {
                 /* This will occur if disable_rc_polling=1 */
                 usb_free_urb(purb);
                 return;
@@ -600,7 +600,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                 goto resubmit;
         }
 
-        ir_keydown(d->rc_input_dev, keycode, toggle);
+        ir_keydown(d->rc_dev, keycode, toggle);
 
 resubmit:
         /* Clean the buffer before we requeue */
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index e06acd1fecb6..be167f2bea33 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -520,13 +520,13 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
                         d->last_event = keycode;
                 }
 
-                ir_keydown(d->rc_input_dev, keycode, 0);
+                ir_keydown(d->rc_dev, keycode, 0);
                 break;
         default:
                 /* RC-5 protocol changes toggle bit on new keypress */
                 keycode = key[3-2] << 8 | key[3-3];
                 toggle = key[3-1];
-                ir_keydown(d->rc_input_dev, keycode, toggle);
+                ir_keydown(d->rc_dev, keycode, toggle);
 
                 break;
         }
@@ -1924,12 +1924,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_interval      = DEFAULT_RC_INTERVAL,
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -1960,12 +1958,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_interval      = DEFAULT_RC_INTERVAL,
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2021,12 +2017,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_interval      = DEFAULT_RC_INTERVAL,
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2065,12 +2059,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2143,12 +2135,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2189,12 +2179,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2259,12 +2247,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2308,12 +2294,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -2379,12 +2363,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                 .num_adapters = 1,
@@ -2417,12 +2399,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                 .num_adapters = 1,
@@ -2487,12 +2467,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                 .num_adapters = 1,
@@ -2533,12 +2511,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                 .num_adapters = 2,
@@ -2584,12 +2560,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                 .num_adapters = 1,
@@ -2623,12 +2597,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .rc_props = {
-                                .allowed_protos = IR_TYPE_RC5 |
-                                                  IR_TYPE_RC6 |
-                                                  IR_TYPE_NEC,
-                                .change_protocol = dib0700_change_protocol,
-                        },
+                        .allowed_protos   = IR_TYPE_RC5 |
+                                            IR_TYPE_RC6 |
+                                            IR_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
                 },
         },
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index b579fed3ab3f..bbba149a2ceb 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -106,10 +106,10 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work)
                         d->last_event = event;
                 case REMOTE_KEY_REPEAT:
                         deb_rc("key repeated\n");
-                        input_event(d->rc_input_dev, EV_KEY, event, 1);
-                        input_sync(d->rc_input_dev);
-                        input_event(d->rc_input_dev, EV_KEY, d->last_event, 0);
-                        input_sync(d->rc_input_dev);
+                        input_event(d->input_dev, EV_KEY, event, 1);
+                        input_sync(d->input_dev);
+                        input_event(d->input_dev, EV_KEY, d->last_event, 0);
+                        input_sync(d->input_dev);
                         break;
                 default:
                         break;
@@ -154,10 +154,22 @@ schedule:
         schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc.legacy.rc_interval));
 }
 
-static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d,
-                                      struct input_dev *input_dev)
+static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d)
 {
         int i, err, rc_interval;
+        struct input_dev *input_dev;
+
+        input_dev = input_allocate_device();
+        if (!input_dev)
+                return -ENOMEM;
+
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        input_dev->name = "IR-receiver inside an USB DVB receiver";
+        input_dev->phys = d->rc_phys;
+        usb_to_input_id(d->udev, &input_dev->id);
+        input_dev->dev.parent = &d->udev->dev;
+        d->input_dev = input_dev;
+        d->rc_dev = NULL;
 
         input_dev->getkeycode = legacy_dvb_usb_getkeycode;
         input_dev->setkeycode = legacy_dvb_usb_setkeycode;
@@ -221,18 +233,34 @@ static void dvb_usb_read_remote_control(struct work_struct *work)
                               msecs_to_jiffies(d->props.rc.core.rc_interval));
 }
 
-static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d,
-                                       struct input_dev *input_dev)
+static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d)
 {
         int err, rc_interval;
+        struct rc_dev *dev;
+
+        dev = rc_allocate_device();
+        if (!dev)
+                return -ENOMEM;
 
-        d->props.rc.core.rc_props.priv = d;
-        err = ir_input_register(input_dev,
-                                 d->props.rc.core.rc_codes,
-                                 &d->props.rc.core.rc_props,
-                                 d->props.rc.core.module_name);
-        if (err < 0)
+        dev->driver_name = d->props.rc.core.module_name;
+        dev->map_name = d->props.rc.core.rc_codes;
+        dev->change_protocol = d->props.rc.core.change_protocol;
+        dev->allowed_protos = d->props.rc.core.allowed_protos;
+        dev->driver_type = RC_DRIVER_SCANCODE;
+        usb_to_input_id(d->udev, &dev->input_id);
+        dev->input_name = "IR-receiver inside an USB DVB receiver";
+        dev->input_phys = d->rc_phys;
+        dev->dev.parent = &d->udev->dev;
+        dev->priv = d;
+
+        err = rc_register_device(dev);
+        if (err < 0) {
+                rc_free_device(dev);
                 return err;
+        }
+
+        d->input_dev = NULL;
+        d->rc_dev = dev;
 
         if (!d->props.rc.core.rc_query || d->props.rc.core.bulk_mode)
                 return 0;
@@ -251,7 +279,6 @@ static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d,
 
 int dvb_usb_remote_init(struct dvb_usb_device *d)
 {
-        struct input_dev *input_dev;
         int err;
 
         if (dvb_usb_disable_rc_polling)
@@ -267,26 +294,14 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
         usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
         strlcat(d->rc_phys, "/ir0", sizeof(d->rc_phys));
 
-        input_dev = input_allocate_device();
-        if (!input_dev)
-                return -ENOMEM;
-
-        input_dev->evbit[0] = BIT_MASK(EV_KEY);
-        input_dev->name = "IR-receiver inside an USB DVB receiver";
-        input_dev->phys = d->rc_phys;
-        usb_to_input_id(d->udev, &input_dev->id);
-        input_dev->dev.parent = &d->udev->dev;
-
         /* Start the remote-control polling. */
         if (d->props.rc.legacy.rc_interval < 40)
                 d->props.rc.legacy.rc_interval = 100; /* default */
 
-        d->rc_input_dev = input_dev;
-
         if (d->props.rc.mode == DVB_RC_LEGACY)
-                err = legacy_dvb_usb_remote_init(d, input_dev);
+                err = legacy_dvb_usb_remote_init(d);
         else
-                err = rc_core_dvb_usb_remote_init(d, input_dev);
+                err = rc_core_dvb_usb_remote_init(d);
         if (err)
                 return err;
 
@@ -301,9 +316,9 @@ int dvb_usb_remote_exit(struct dvb_usb_device *d)
                 cancel_rearming_delayed_work(&d->rc_query_work);
                 flush_scheduled_work();
                 if (d->props.rc.mode == DVB_RC_LEGACY)
-                        input_unregister_device(d->rc_input_dev);
+                        input_unregister_device(d->input_dev);
                 else
-                        ir_input_unregister(d->rc_input_dev);
+                        rc_unregister_device(d->rc_dev);
         }
         d->state &= ~DVB_USB_STATE_REMOTE;
         return 0;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 34f7b3ba8cc7..83aa9826560f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -180,18 +180,20 @@ struct dvb_rc_legacy {
  * struct dvb_rc properties of remote controller, using rc-core
  * @rc_codes: name of rc codes table
  * @protocol: type of protocol(s) currently used by the driver
+ * @allowed_protos: protocol(s) supported by the driver
+ * @change_protocol: callback to change protocol
  * @rc_query: called to query an event event.
  * @rc_interval: time in ms between two queries.
- * @rc_props: remote controller properties
  * @bulk_mode: device supports bulk mode for RC (disable polling mode)
  */
 struct dvb_rc {
         char *rc_codes;
         u64 protocol;
+        u64 allowed_protos;
+        int (*change_protocol)(struct rc_dev *dev, u64 ir_type);
         char *module_name;
         int (*rc_query) (struct dvb_usb_device *d);
         int rc_interval;
-        struct ir_dev_props rc_props;
         bool bulk_mode;                         /* uses bulk mode */
 };
 
@@ -385,7 +387,8 @@ struct dvb_usb_adapter {
  *
  * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB
  *
- * @rc_input_dev: input device for the remote control.
+ * @rc_dev: rc device for the remote control (rc-core mode)
+ * @input_dev: input device for the remote control (legacy mode)
  * @rc_query_work: struct work_struct frequent rc queries
  * @last_event: last triggered event
  * @last_state: last state (no, pressed, repeat)
@@ -418,7 +421,8 @@ struct dvb_usb_device {
         struct dvb_usb_adapter adapter[MAX_NO_OF_ADAPTER_PER_DEVICE];
 
         /* remote control */
-        struct input_dev *rc_input_dev;
+        struct rc_dev *rc_dev;
+        struct input_dev *input_dev;
         char rc_phys[64];
         struct delayed_work rc_query_work;
         u32 last_event;
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index de7f1fbec92e..d8f1b150e1cb 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -198,7 +198,7 @@ static int lme2510_remote_keypress(struct dvb_usb_adapter *adap, u16 keypress)
         deb_info(1, "INT Key Keypress =%04x", keypress);
 
         if (keypress > 0)
-                ir_keydown(d->rc_input_dev, keypress, 0);
+                ir_keydown(d->rc_dev, keypress, 0);
 
         return 0;
 }
@@ -555,42 +555,39 @@ static int lme2510_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 static int lme2510_int_service(struct dvb_usb_adapter *adap)
 {
         struct dvb_usb_device *d = adap->dev;
-        struct input_dev *input_dev;
-        char *ir_codes = RC_MAP_LME2510;
-        int ret = 0;
+        struct rc_dev *rc;
+        int ret;
 
         info("STA Configuring Remote");
 
-        usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
-
-        strlcat(d->rc_phys, "/ir0", sizeof(d->rc_phys));
-
-        input_dev = input_allocate_device();
-        if (!input_dev)
+        rc = rc_allocate_device();
+        if (!rc)
                 return -ENOMEM;
 
-        input_dev->name = "LME2510 Remote Control";
-        input_dev->phys = d->rc_phys;
-
-        usb_to_input_id(d->udev, &input_dev->id);
+        usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
+        strlcat(d->rc_phys, "/ir0", sizeof(d->rc_phys));
 
-        ret |= ir_input_register(input_dev, ir_codes, NULL, "LME 2510");
+        rc->input_name = "LME2510 Remote Control";
+        rc->input_phys = d->rc_phys;
+        rc->map_name = RC_MAP_LME2510;
+        rc->driver_name = "LME 2510";
+        usb_to_input_id(d->udev, &rc->input_id);
 
+        ret = rc_register_device(rc);
         if (ret) {
-                input_free_device(input_dev);
+                rc_free_device(rc);
                 return ret;
         }
+        d->rc_dev = rc;
 
-        d->rc_input_dev = input_dev;
         /* Start the Interupt */
         ret = lme2510_int_read(adap);
-
         if (ret < 0) {
-                ir_input_unregister(input_dev);
-                input_free_device(input_dev);
+                rc_unregister_device(rc);
+                return -ENODEV;
         }
 
-        return (ret < 0) ? -ENODEV : 0;
+        return 0;
 }
 
 static u8 check_sum(u8 *p, u8 len)
@@ -1025,7 +1022,7 @@ void *lme2510_exit_int(struct dvb_usb_device *d)
                 usb_free_coherent(d->udev, 5000, st->buffer,
                                   st->lme_urb->transfer_dma);
                 info("Interupt Service Stopped");
-                ir_input_unregister(d->rc_input_dev);
+                rc_unregister_device(d->rc_dev);
                 info("Remote Stopped");
         }
         return buffer;