mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-28 20:37:27 +00:00
[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>
This commit is contained in:
parent
1d968cdaae
commit
9b4539bebb
@ -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)
|
static void em28xx_ir_work(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct em28xx_IR *ir = container_of(work, struct em28xx_IR, work.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));
|
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;
|
struct em28xx_IR *ir = rc->priv;
|
||||||
|
|
||||||
if (ir->i2c_dev_addr) /* external i2c device */
|
INIT_DELAYED_WORK(&ir->work, em28xx_ir_work);
|
||||||
INIT_DELAYED_WORK(&ir->work, em28xx_i2c_ir_work);
|
|
||||||
else /* internal device */
|
|
||||||
INIT_DELAYED_WORK(&ir->work, em28xx_ir_work);
|
|
||||||
schedule_delayed_work(&ir->work, 0);
|
schedule_delayed_work(&ir->work, 0);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user