[media] em28xx: input: use common work_struct callback function for IR RC key polling

Remove em28xx_i2c_ir_work() and check the device type in the common callback
function em28xx_ir_work() instead. Simplifies em28xx_ir_start().
Reduces the code size with a minor performance drawback.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 63b97285ddbd364f92a71358faf66647b08d1574..1bef990b3f18b8770142dc53e054c7af1b763837 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -338,19 +338,14 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir)
        }
 }
 
-static void em28xx_i2c_ir_work(struct work_struct *work)
-{
-       struct em28xx_IR *ir = container_of(work, struct em28xx_IR, work.work);
-
-       em28xx_i2c_ir_handle_key(ir);
-       schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
-}
-
 static void em28xx_ir_work(struct work_struct *work)
 {
        struct em28xx_IR *ir = container_of(work, struct em28xx_IR, work.work);
 
-       em28xx_ir_handle_key(ir);
+       if (ir->i2c_dev_addr) /* external i2c device */
+               em28xx_i2c_ir_handle_key(ir);
+       else /* internal device */
+               em28xx_ir_handle_key(ir);
        schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
 }
 
@@ -358,10 +353,7 @@ static int em28xx_ir_start(struct rc_dev *rc)
 {
        struct em28xx_IR *ir = rc->priv;
 
-       if (ir->i2c_dev_addr) /* external i2c device */
-               INIT_DELAYED_WORK(&ir->work, em28xx_i2c_ir_work);
-       else /* internal device */
-               INIT_DELAYED_WORK(&ir->work, em28xx_ir_work);
+       INIT_DELAYED_WORK(&ir->work, em28xx_ir_work);
        schedule_delayed_work(&ir->work, 0);
 
        return 0;