1 files changed, 50 insertions, 26 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index ce4a75375909..c87b6bc45555 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -46,7 +46,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 
 /* ----------------------------------------------------------------------- */
@@ -252,7 +252,7 @@ static void ir_key_poll(struct IR_i2c *ir)
         }
 
         if (rc)
-                ir_keydown(ir->input, ir_key, 0);
+                rc_keydown(ir->rc, ir_key, 0);
 }
 
 static void ir_work(struct work_struct *work)
@@ -269,22 +269,18 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         char *ir_codes = NULL;
         const char *name = NULL;
-        u64 ir_type = 0;
+        u64 rc_type = RC_TYPE_UNKNOWN;
         struct IR_i2c *ir;
-        struct input_dev *input_dev;
+        struct rc_dev *rc = NULL;
         struct i2c_adapter *adap = client->adapter;
         unsigned short addr = client->addr;
         int err;
 
-        ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!ir || !input_dev) {
-                err = -ENOMEM;
-                goto err_out_free;
-        }
+        ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
+        if (!ir)
+                return -ENOMEM;
 
         ir->c = client;
-        ir->input = input_dev;
         ir->polling_interval = DEFAULT_POLLING_INTERVAL;
         i2c_set_clientdata(client, ir);
 
@@ -292,7 +288,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         case 0x64:
                 name        = "Pixelview";
                 ir->get_key = get_key_pixelview;
-                ir_type     = IR_TYPE_OTHER;
+                rc_type     = RC_TYPE_OTHER;
                 ir_codes    = RC_MAP_EMPTY;
                 break;
         case 0x18:
@@ -300,7 +296,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         case 0x1a:
                 name        = "Hauppauge";
                 ir->get_key = get_key_haup;
-                ir_type     = IR_TYPE_RC5;
+                rc_type     = RC_TYPE_RC5;
                 if (hauppauge == 1) {
                         ir_codes    = RC_MAP_HAUPPAUGE_NEW;
                 } else {
@@ -310,19 +306,19 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         case 0x30:
                 name        = "KNC One";
                 ir->get_key = get_key_knc1;
-                ir_type     = IR_TYPE_OTHER;
+                rc_type     = RC_TYPE_OTHER;
                 ir_codes    = RC_MAP_EMPTY;
                 break;
         case 0x6b:
                 name        = "FusionHDTV";
                 ir->get_key = get_key_fusionhdtv;
-                ir_type     = IR_TYPE_RC5;
+                rc_type     = RC_TYPE_RC5;
                 ir_codes    = RC_MAP_FUSIONHDTV_MCE;
                 break;
         case 0x40:
                 name        = "AVerMedia Cardbus remote";
                 ir->get_key = get_key_avermedia_cardbus;
-                ir_type     = IR_TYPE_OTHER;
+                rc_type     = RC_TYPE_OTHER;
                 ir_codes    = RC_MAP_AVERMEDIA_CARDBUS;
                 break;
         }
@@ -333,9 +329,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                                                 client->dev.platform_data;
 
                 ir_codes = init_data->ir_codes;
+                rc = init_data->rc_dev;
+
                 name = init_data->name;
                 if (init_data->type)
-                        ir_type = init_data->type;
+                        rc_type = init_data->type;
 
                 if (init_data->polling_interval)
                         ir->polling_interval = init_data->polling_interval;
@@ -366,8 +364,21 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 }
         }
 
+        if (!rc) {
+                /*
+                 * If platform_data doesn't specify rc_dev, initilize it
+                 * internally
+                 */
+                rc = rc_allocate_device();
+                if (!rc) {
+                        err = -ENOMEM;
+                        goto err_out_free;
+                }
+        }
+        ir->rc = rc;
+
         /* Make sure we are all setup before going on */
-        if (!name || !ir->get_key || !ir_type || !ir_codes) {
+        if (!name || !ir->get_key || !rc_type || !ir_codes) {
                 dprintk(1, ": Unsupported device at address 0x%02x\n",
                         addr);
                 err = -ENODEV;
@@ -382,18 +393,28 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  dev_name(&adap->dev),
                  dev_name(&client->dev));
 
-        /* init + register input device */
-        ir->ir_type = ir_type;
-        input_dev->id.bustype = BUS_I2C;
-        input_dev->name       = ir->name;
-        input_dev->phys       = ir->phys;
+        /*
+         * Initialize input_dev fields
+         * It doesn't make sense to allow overriding them via platform_data
+         */
+        rc->input_id.bustype = BUS_I2C;
+        rc->input_phys       = ir->phys;
+        rc->input_name       = ir->name;
+
+        /*
+         * Initialize the other fields of rc_dev
+         */
+        rc->map_name       = ir->ir_codes;
+        rc->allowed_protos = rc_type;
+        if (!rc->driver_name)
+                rc->driver_name = MODULE_NAME;
 
-        err = ir_input_register(ir->input, ir->ir_codes, NULL, MODULE_NAME);
+        err = rc_register_device(rc);
         if (err)
                 goto err_out_free;
 
         printk(MODULE_NAME ": %s detected at %s [%s]\n",
-               ir->input->name, ir->input->phys, adap->name);
+               ir->name, ir->phys, adap->name);
 
         /* start polling via eventd */
         INIT_DELAYED_WORK(&ir->work, ir_work);
@@ -402,6 +423,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         return 0;
 
  err_out_free:
+        /* Only frees rc if it were allocated internally */
+        rc_free_device(rc);
         kfree(ir);
         return err;
 }
@@ -414,7 +437,7 @@ static int ir_remove(struct i2c_client *client)
         cancel_delayed_work_sync(&ir->work);
 
         /* unregister device */
-        ir_input_unregister(ir->input);
+        rc_unregister_device(ir->rc);
 
         /* free memory */
         kfree(ir);
@@ -426,6 +449,7 @@ static const struct i2c_device_id ir_kbd_id[] = {
         { "ir_video", 0 },
         /* IR device specific entries should be added here */
         { "ir_rx_z8f0811_haup", 0 },
+        { "ir_rx_z8f0811_hdpvr", 0 },
         { }
 };