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>

7 files changed, 14 insertions, 37 deletions

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;
 }