Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 44 insertions, 32 deletions

diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index a99489b8418b..db6d54d3fec0 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -18,8 +18,7 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/input.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <linux/pci.h>
 
 #include "dmxdev.h"
@@ -33,8 +32,9 @@
 #include "mantis_uart.h"
 
 #define MODULE_NAME "mantis_core"
+#define RC_MAP_MANTIS "rc-mantis"
 
-static struct ir_scancode mantis_ir_table[] = {
+static struct rc_map_table mantis_ir_table[] = {
         { 0x29, KEY_POWER       },
         { 0x28, KEY_FAVORITES   },
         { 0x30, KEY_TEXT        },
@@ -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_map_list ir_mantis_map = {
+        .map = {
+                .scan = mantis_ir_table,
+                .size = ARRAY_SIZE(mantis_ir_table),
+                .rc_type = RC_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 = rc_map_register(&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:
+        rc_map_unregister(&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);
+        rc_map_unregister(&ir_mantis_map);
         return 0;
 }
+