V4L/DVB (13617): ir: move input_register_device() to happen inside ir_input_register()

We'll need to register a sysfs class for the IR devices. As such, the better
is to have the input_register_device()/input_unregister_device() inside
the ir register/unregister functions.

Also, solves a naming problem with V4L ir_input_init() function, that were,
in fact, registering a device.

While here, do a few cleanups at budget-ci IR logic.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

12 files changed, 48 insertions, 91 deletions

diff --git a/drivers/media/IR/ir-functions.c b/drivers/media/IR/ir-functions.c
index 7401a7989719..776a136616d6 100644
--- a/drivers/media/IR/ir-functions.c
+++ b/drivers/media/IR/ir-functions.c
@@ -52,15 +52,13 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
 /* -------------------------------------------------------------------------- */
 
 int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
-                   int ir_type, struct ir_scancode_table *ir_codes)
+                   int ir_type)
 {
         ir->ir_type = ir_type;
 
         if (repeat)
                 set_bit(EV_REP, dev->evbit);
 
-        ir_input_register(dev, ir_codes);
-
         return 0;
 }
 EXPORT_SYMBOL_GPL(ir_input_init);
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index e9c9bd34af65..bff7a5356037 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -12,8 +12,8 @@
  *  GNU General Public License for more details.
  */
 
-#include <linux/usb/input.h>
 
+#include <linux/usb/input.h>
 #include <media/ir-common.h>
 
 #define IR_TAB_MIN_SIZE 32
@@ -408,7 +408,7 @@ int ir_input_register(struct input_dev *input_dev,
 {
         struct ir_input_dev *ir_dev;
         struct ir_scancode  *keymap    = rc_tab->scan;
-        int i;
+        int i, rc;
 
         if (rc_tab->scan == NULL || !rc_tab->size)
                 return -EINVAL;
@@ -446,26 +446,34 @@ int ir_input_register(struct input_dev *input_dev,
         input_dev->setkeycode = ir_setkeycode;
         input_set_drvdata(input_dev, ir_dev);
 
-        return 0;
+        rc = input_register_device(input_dev);
+        if (rc < 0) {
+                kfree(rc_tab->scan);
+                kfree(ir_dev);
+                input_set_drvdata(input_dev, NULL);
+        }
+
+        return rc;
 }
 EXPORT_SYMBOL_GPL(ir_input_register);
 
 void ir_input_unregister(struct input_dev *dev)
 {
         struct ir_input_dev *ir_dev = input_get_drvdata(dev);
-        struct ir_scancode_table *rc_tab = &ir_dev->rc_tab;
+        struct ir_scancode_table *rc_tab;
 
-        if (!rc_tab)
+        if (!ir_dev)
                 return;
 
         IR_dprintk(1, "Freed keycode table\n");
 
+        rc_tab = &ir_dev->rc_tab;
         rc_tab->size = 0;
         kfree(rc_tab->scan);
         rc_tab->scan = NULL;
 
         kfree(ir_dev);
-        input_set_drvdata(dev, NULL);
+        input_unregister_device(dev);
 }
 EXPORT_SYMBOL_GPL(ir_input_unregister);
 
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 34e4e569cc7d..f0f483ac8b89 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -589,7 +589,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
         snprintf(dm1105->ir.input_phys, sizeof(dm1105->ir.input_phys),
                 "pci-%s/ir0", pci_name(dm1105->pdev));
 
-        err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type);
         if (err < 0) {
                 input_free_device(input_dev);
                 return err;
@@ -611,20 +611,14 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
 
         INIT_WORK(&dm1105->ir.work, dm1105_emit_key);
 
-        err = input_register_device(input_dev);
-        if (err) {
-                ir_input_unregister(input_dev);
-                input_free_device(input_dev);
-                return err;
-        }
+        err = ir_input_register(input_dev, ir_codes);
 
-        return 0;
+        return err;
 }
 
 void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)
 {
         ir_input_unregister(dm1105->ir.input_dev);
-        input_unregister_device(dm1105->ir.input_dev);
 }
 
 static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 9c9070a403dd..9782e0593733 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -190,12 +190,13 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         struct saa7146_dev *saa = budget_ci->budget.dev;
         struct input_dev *input_dev = budget_ci->ir.dev;
         int error;
+        struct ir_scancode_table *ir_codes;
+
 
         budget_ci->ir.dev = input_dev = input_allocate_device();
         if (!input_dev) {
                 printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
-                error = -ENOMEM;
-                goto out1;
+                return -ENOMEM;
         }
 
         snprintf(budget_ci->ir.name, sizeof(budget_ci->ir.name),
@@ -217,6 +218,11 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         }
         input_dev->dev.parent = &saa->pci->dev;
 
+        if (rc5_device < 0)
+                budget_ci->ir.rc5_device = IR_DEVICE_ANY;
+        else
+                budget_ci->ir.rc5_device = rc5_device;
+
         /* Select keymap and address */
         switch (budget_ci->budget.dev->pci->subsystem_device) {
         case 0x100c:
@@ -224,53 +230,34 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1011:
         case 0x1012:
                 /* The hauppauge keymap is a superset of these remotes */
-                error = ir_input_init(input_dev, &budget_ci->ir.state,
-                              IR_TYPE_RC5, &ir_codes_hauppauge_new_table);
-                if (error < 0)
-                        goto out2;
+                ir_codes = &ir_codes_hauppauge_new_table;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = 0x1f;
-                else
-                        budget_ci->ir.rc5_device = rc5_device;
                 break;
         case 0x1010:
         case 0x1017:
         case 0x101a:
                 /* for the Technotrend 1500 bundled remote */
-                error = ir_input_init(input_dev, &budget_ci->ir.state,
-                              IR_TYPE_RC5, &ir_codes_tt_1500_table);
-                if (error < 0)
-                        goto out2;
-
-                if (rc5_device < 0)
-                        budget_ci->ir.rc5_device = IR_DEVICE_ANY;
-                else
-                        budget_ci->ir.rc5_device = rc5_device;
+                ir_codes = &ir_codes_tt_1500_table;
                 break;
         default:
                 /* unknown remote */
-                error = ir_input_init(input_dev, &budget_ci->ir.state,
-                              IR_TYPE_RC5, &ir_codes_budget_ci_old_table);
-                if (error < 0)
-                        goto out2;
-
-                if (rc5_device < 0)
-                        budget_ci->ir.rc5_device = IR_DEVICE_ANY;
-                else
-                        budget_ci->ir.rc5_device = rc5_device;
+                ir_codes = &ir_codes_budget_ci_old_table;
                 break;
         }
 
+        ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5);
+
         /* initialise the key-up timeout handler */
         init_timer(&budget_ci->ir.timer_keyup);
         budget_ci->ir.timer_keyup.function = msp430_ir_keyup;
         budget_ci->ir.timer_keyup.data = (unsigned long) &budget_ci->ir;
         budget_ci->ir.last_raw = 0xffff; /* An impossible value */
-        error = input_register_device(input_dev);
+        error = ir_input_register(input_dev, ir_codes);
         if (error) {
                 printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);
-                goto out2;
+                return error;
         }
 
         /* note: these must be after input_register_device */
@@ -284,12 +271,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);
 
         return 0;
-
-out2:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
-out1:
-        return error;
 }
 
 static void msp430_ir_deinit(struct budget_ci *budget_ci)
@@ -305,7 +286,6 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)
         ir_input_nokey(dev, &budget_ci->ir.state);
 
         ir_input_unregister(dev);
-        input_unregister_device(dev);
 }
 
 static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 0e1a7aabefba..277a092e1214 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -368,7 +368,7 @@ int bttv_input_init(struct bttv *btv)
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(btv->c.pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -389,7 +389,7 @@ int bttv_input_init(struct bttv *btv)
         bttv_ir_start(btv, ir);
 
         /* all done */
-        err = input_register_device(btv->remote->dev);
+        err = ir_input_register(btv->remote->dev, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -403,8 +403,6 @@ int bttv_input_init(struct bttv *btv)
         bttv_ir_stop(btv);
         btv->remote = NULL;
  err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -416,7 +414,6 @@ void bttv_input_fini(struct bttv *btv)
 
         bttv_ir_stop(btv);
         ir_input_unregister(btv->remote->dev);
-        input_unregister_device(btv->remote->dev);
         kfree(btv->remote);
         btv->remote = NULL;
 }
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
index 5eba1ec1205b..15826f98b688 100644
--- a/drivers/media/video/cx231xx/cx231xx-input.c
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -197,8 +197,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
         usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
         strlcat(ir->phys, "/input0", sizeof(ir->phys));
 
-        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER,
-                            dev->board.ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
         if (err < 0)
                 goto err_out_free;
 
@@ -217,7 +216,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
         cx231xx_ir_start(ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, dev->board.ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -226,8 +225,6 @@ err_out_stop:
         cx231xx_ir_stop(ir);
         dev->ir = NULL;
 err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -242,7 +239,6 @@ int cx231xx_ir_fini(struct cx231xx *dev)
 
         cx231xx_ir_stop(ir);
         ir_input_unregister(ir->input);
-        input_unregister_device(ir->input);
         kfree(ir);
 
         /* done */
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 2a5e4d959e8e..768eec92ccf9 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -377,7 +377,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
                  cx23885_boards[dev->board].name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(dev->pci));
 
-        ret = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        ret = ir_input_init(input_dev, &ir->ir, ir_type);
         if (ret < 0)
                 goto err_out_free;
 
@@ -397,7 +397,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
         dev->ir_input = ir;
         cx23885_input_ir_start(dev);
 
-        ret = input_register_device(ir->dev);
+        ret = ir_input_register(ir->dev, ir_codes);
         if (ret)
                 goto err_out_stop;
 
@@ -407,8 +407,6 @@ err_out_stop:
         cx23885_input_ir_stop(dev);
         dev->ir_input = NULL;
 err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return ret;
 }
@@ -421,7 +419,6 @@ void cx23885_input_fini(struct cx23885_dev *dev)
         if (dev->ir_input == NULL)
                 return;
         ir_input_unregister(dev->ir_input->dev);
-        input_unregister_device(dev->ir_input->dev);
         kfree(dev->ir_input);
         dev->ir_input = NULL;
 }
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index d4dc2c2a3cbc..f9fda18b410c 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -360,7 +360,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -383,7 +383,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_start(core, ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -393,8 +393,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_stop(core, ir);
         core->ir = NULL;
  err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -409,7 +407,6 @@ int cx88_ir_fini(struct cx88_core *core)
 
         cx88_ir_stop(core, ir);
         ir_input_unregister(ir->input);
-        input_unregister_device(ir->input);
         kfree(ir);
 
         /* done */
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 9dc4e142726b..af0d935c29be 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -393,8 +393,7 @@ int em28xx_ir_init(struct em28xx *dev)
         usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
         strlcat(ir->phys, "/input0", sizeof(ir->phys));
 
-        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER,
-                             dev->board.ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
         if (err < 0)
                 goto err_out_free;
 
@@ -413,7 +412,7 @@ int em28xx_ir_init(struct em28xx *dev)
         em28xx_ir_start(ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, dev->board.ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -422,8 +421,6 @@ int em28xx_ir_init(struct em28xx *dev)
         em28xx_ir_stop(ir);
         dev->ir = NULL;
  err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -438,7 +435,6 @@ int em28xx_ir_fini(struct em28xx *dev)
 
         em28xx_ir_stop(ir);
         ir_input_unregister(ir->input);
-        input_unregister_device(ir->input);
         kfree(ir);
 
         /* done */
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9d8e78dc614e..b86e35386cee 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -438,7 +438,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  dev_name(&client->dev));
 
         /* init + register input device */
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -446,7 +446,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         input_dev->name       = ir->name;
         input_dev->phys       = ir->phys;
 
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, ir->ir_codes);
         if (err)
                 goto err_out_free;
 
@@ -460,8 +460,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         return 0;
 
  err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -475,7 +473,6 @@ static int ir_remove(struct i2c_client *client)
 
         /* unregister device */
         ir_input_unregister(ir->input);
-        input_unregister_device(ir->input);
 
         /* free memory */
         kfree(ir);
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 5093e7a0d58c..f8e985989ca0 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -708,7 +708,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(dev->pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -728,7 +728,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         dev->remote = ir;
         saa7134_ir_start(dev, ir);
 
-        err = input_register_device(ir->dev);
+        err = ir_input_register(ir->dev, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -742,8 +742,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         saa7134_ir_stop(dev);
         dev->remote = NULL;
  err_out_free:
-        ir_input_unregister(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -755,7 +753,6 @@ void saa7134_input_fini(struct saa7134_dev *dev)
 
         saa7134_ir_stop(dev);
         ir_input_unregister(dev->remote->dev);
-        input_unregister_device(dev->remote->dev);
         kfree(dev->remote);
         dev->remote = NULL;
 }
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index ac8ced6bf3e2..2c6af24b905e 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -84,7 +84,7 @@ struct card_ir {
 /* Routines from ir-functions.c */
 
 int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
-                   int ir_type, struct ir_scancode_table *ir_codes);
+                   int ir_type);
 void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir);
 void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
                       u32 ir_key);