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>

1 files changed, 2 insertions, 6 deletions

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 */