[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>

1 files changed, 42 insertions, 30 deletions

diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index a99489b8418b..209f2110e20c 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -18,7 +18,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/input.h>
 #include <media/ir-core.h>
 #include <linux/pci.h>
 
@@ -33,6 +32,7 @@
 #include "mantis_uart.h"
 
 #define MODULE_NAME "mantis_core"
+#define RC_MAP_MANTIS "rc-mantis"
 
 static struct ir_scancode mantis_ir_table[] = {
         { 0x29, KEY_POWER       },
@@ -95,53 +95,65 @@ static struct ir_scancode mantis_ir_table[] = {
         { 0x00, KEY_BLUE        },
 };
 
-struct ir_scancode_table ir_mantis = {
-        .scan = mantis_ir_table,
-        .size = ARRAY_SIZE(mantis_ir_table),
+static struct rc_keymap ir_mantis_map = {
+        .map = {
+                .scan = mantis_ir_table,
+                .size = ARRAY_SIZE(mantis_ir_table),
+                .ir_type = IR_TYPE_UNKNOWN,
+                .name = RC_MAP_MANTIS,
+        }
 };
-EXPORT_SYMBOL_GPL(ir_mantis);
 
 int mantis_input_init(struct mantis_pci *mantis)
 {
-        struct input_dev *rc;
-        char name[80], dev[80];
+        struct rc_dev *dev;
         int err;
 
-        rc = input_allocate_device();
-        if (!rc) {
-                dprintk(MANTIS_ERROR, 1, "Input device allocate failed");
-                return -ENOMEM;
-        }
+        err = ir_register_map(&ir_mantis_map);
+        if (err)
+                goto out;
 
-        sprintf(name, "Mantis %s IR receiver", mantis->hwconfig->model_name);
-        sprintf(dev, "pci-%s/ir0", pci_name(mantis->pdev));
+        dev = rc_allocate_device();
+        if (!dev) {
+                dprintk(MANTIS_ERROR, 1, "Remote device allocation failed");
+                err = -ENOMEM;
+                goto out_map;
+        }
 
-        rc->name = name;
-        rc->phys = dev;
+        sprintf(mantis->input_name, "Mantis %s IR receiver", mantis->hwconfig->model_name);
+        sprintf(mantis->input_phys, "pci-%s/ir0", pci_name(mantis->pdev));
 
-        rc->id.bustype  = BUS_PCI;
-        rc->id.vendor   = mantis->vendor_id;
-        rc->id.product  = mantis->device_id;
-        rc->id.version  = 1;
-        rc->dev         = mantis->pdev->dev;
+        dev->input_name         = mantis->input_name;
+        dev->input_phys         = mantis->input_phys;
+        dev->input_id.bustype   = BUS_PCI;
+        dev->input_id.vendor    = mantis->vendor_id;
+        dev->input_id.product   = mantis->device_id;
+        dev->input_id.version   = 1;
+        dev->driver_name        = MODULE_NAME;
+        dev->map_name           = RC_MAP_MANTIS;
+        dev->dev.parent         = &mantis->pdev->dev;
 
-        err = __ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME);
+        err = rc_register_device(dev);
         if (err) {
                 dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
-                input_free_device(rc);
-                return -ENODEV;
+                goto out_dev;
         }
 
-        mantis->rc = rc;
-
+        mantis->rc = dev;
         return 0;
+
+out_dev:
+        rc_free_device(dev);
+out_map:
+        ir_unregister_map(&ir_mantis_map);
+out:
+        return err;
 }
 
 int mantis_exit(struct mantis_pci *mantis)
 {
-        struct input_dev *rc = mantis->rc;
-
-        ir_input_unregister(rc);
-
+        rc_unregister_device(mantis->rc);
+        ir_unregister_map(&ir_mantis_map);
         return 0;
 }
+