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

2 files changed, 31 insertions, 36 deletions

diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index bb61870b8d6e..f1bb3a8683c1 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -35,7 +35,6 @@
  *  02110-1301, USA.
  */
 
-#include <linux/input.h>
 #include <linux/slab.h>
 #include <media/ir-core.h>
 #include <media/v4l2-subdev.h>
@@ -62,16 +61,16 @@ static void cx23885_input_process_measurements(struct cx23885_dev *dev,
                 count = num / sizeof(struct ir_raw_event);
 
                 for (i = 0; i < count; i++) {
-                        ir_raw_event_store(kernel_ir->inp_dev,
+                        ir_raw_event_store(kernel_ir->rc,
                                            &ir_core_event[i]);
                         handle = true;
                 }
         } while (num != 0);
 
         if (overrun)
-                ir_raw_event_reset(kernel_ir->inp_dev);
+                ir_raw_event_reset(kernel_ir->rc);
         else if (handle)
-                ir_raw_event_handle(kernel_ir->inp_dev);
+                ir_raw_event_handle(kernel_ir->rc);
 }
 
 void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
@@ -197,9 +196,9 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
         return 0;
 }
 
-static int cx23885_input_ir_open(void *priv)
+static int cx23885_input_ir_open(struct rc_dev *rc)
 {
-        struct cx23885_kernel_ir *kernel_ir = priv;
+        struct cx23885_kernel_ir *kernel_ir = rc->priv;
 
         if (kernel_ir->cx == NULL)
                 return -ENODEV;
@@ -234,9 +233,9 @@ static void cx23885_input_ir_stop(struct cx23885_dev *dev)
         flush_scheduled_work();
 }
 
-static void cx23885_input_ir_close(void *priv)
+static void cx23885_input_ir_close(struct rc_dev *rc)
 {
-        struct cx23885_kernel_ir *kernel_ir = priv;
+        struct cx23885_kernel_ir *kernel_ir = rc->priv;
 
         if (kernel_ir->cx != NULL)
                 cx23885_input_ir_stop(kernel_ir->cx);
@@ -245,9 +244,7 @@ static void cx23885_input_ir_close(void *priv)
 int cx23885_input_init(struct cx23885_dev *dev)
 {
         struct cx23885_kernel_ir *kernel_ir;
-        struct input_dev *inp_dev;
-        struct ir_dev_props *props;
-
+        struct rc_dev *rc;
         char *rc_map;
         enum rc_driver_type driver_type;
         unsigned long allowed_protos;
@@ -294,37 +291,36 @@ int cx23885_input_init(struct cx23885_dev *dev)
                                     pci_name(dev->pci));
 
         /* input device */
-        inp_dev = input_allocate_device();
-        if (inp_dev == NULL) {
+        rc = rc_allocate_device();
+        if (!rc) {
                 ret = -ENOMEM;
                 goto err_out_free;
         }
 
-        kernel_ir->inp_dev = inp_dev;
-        inp_dev->name = kernel_ir->name;
-        inp_dev->phys = kernel_ir->phys;
-        inp_dev->id.bustype = BUS_PCI;
-        inp_dev->id.version = 1;
+        kernel_ir->rc = rc;
+        rc->input_name = kernel_ir->name;
+        rc->input_phys = kernel_ir->phys;
+        rc->input_id.bustype = BUS_PCI;
+        rc->input_id.version = 1;
         if (dev->pci->subsystem_vendor) {
-                inp_dev->id.vendor  = dev->pci->subsystem_vendor;
-                inp_dev->id.product = dev->pci->subsystem_device;
+                rc->input_id.vendor  = dev->pci->subsystem_vendor;
+                rc->input_id.product = dev->pci->subsystem_device;
         } else {
-                inp_dev->id.vendor  = dev->pci->vendor;
-                inp_dev->id.product = dev->pci->device;
+                rc->input_id.vendor  = dev->pci->vendor;
+                rc->input_id.product = dev->pci->device;
         }
-        inp_dev->dev.parent = &dev->pci->dev;
-
-        /* kernel ir device properties */
-        props = &kernel_ir->props;
-        props->driver_type = driver_type;
-        props->allowed_protos = allowed_protos;
-        props->priv = kernel_ir;
-        props->open = cx23885_input_ir_open;
-        props->close = cx23885_input_ir_close;
+        rc->dev.parent = &dev->pci->dev;
+        rc->driver_type = driver_type;
+        rc->allowed_protos = allowed_protos;
+        rc->priv = kernel_ir;
+        rc->open = cx23885_input_ir_open;
+        rc->close = cx23885_input_ir_close;
+        rc->map_name = rc_map;
+        rc->driver_name = MODULE_NAME;
 
         /* Go */
         dev->kernel_ir = kernel_ir;
-        ret = ir_input_register(inp_dev, rc_map, props, MODULE_NAME);
+        ret = rc_register_device(rc);
         if (ret)
                 goto err_out_stop;
 
@@ -333,7 +329,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
 err_out_stop:
         cx23885_input_ir_stop(dev);
         dev->kernel_ir = NULL;
-        /* TODO: double check clean-up of kernel_ir->inp_dev */
+        rc_free_device(rc);
 err_out_free:
         kfree(kernel_ir->phys);
         kfree(kernel_ir->name);
@@ -348,7 +344,7 @@ void cx23885_input_fini(struct cx23885_dev *dev)
 
         if (dev->kernel_ir == NULL)
                 return;
-        ir_input_unregister(dev->kernel_ir->inp_dev);
+        rc_unregister_device(dev->kernel_ir->rc);
         kfree(dev->kernel_ir->phys);
         kfree(dev->kernel_ir->name);
         kfree(dev->kernel_ir);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index ed94b17dd8a5..f350d88944e8 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -310,8 +310,7 @@ struct cx23885_kernel_ir {
         char                    *name;
         char                    *phys;
 
-        struct input_dev        *inp_dev;
-        struct ir_dev_props     props;
+        struct rc_dev           *rc;
 };
 
 struct cx23885_dev {