Skip to content

Commit

Permalink
[media] em28xx: input: use common work_struct callback function for I…
Browse files Browse the repository at this point in the history
…R 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>
  • Loading branch information
Frank Schaefer authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent 1d968cd commit 9b4539b
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions drivers/media/usb/em28xx/em28xx-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,30 +338,22 @@ 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));
}

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;
Expand Down

0 comments on commit 9b4539b

Please sign in to comment.