| Message ID | 5dc00d657718dfefedb35b055abd13997afd6979.1393027856.git.shuah.kh@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Fri, 21 Feb 2014 17:50:16 -0700 Shuah Khan <shuah.kh@samsung.com> escreveu: > Implement em28xx_ops: suspend/resume hooks. em28xx usb driver will > invoke em28xx_ops: suspend and resume hooks for all its extensions > from its suspend() and resume() interfaces. > > Signed-off-by: Shuah Khan <shuah.kh@samsung.com> > --- > drivers/media/usb/em28xx/em28xx-input.c | 35 +++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c > index 18f65d8..1227309 100644 > --- a/drivers/media/usb/em28xx/em28xx-input.c > +++ b/drivers/media/usb/em28xx/em28xx-input.c > @@ -827,11 +827,46 @@ static int em28xx_ir_fini(struct em28xx *dev) > return 0; > } > > +static int em28xx_ir_suspend(struct em28xx *dev) > +{ > + struct em28xx_IR *ir = dev->ir; > + > + if (dev->is_audio_only) > + return 0; > + > + em28xx_info("Suspending input extension"); > + cancel_delayed_work_sync(&ir->work); > + cancel_delayed_work_sync(&dev->buttons_query_work); > + /* is canceling delayed work sufficient or does the rc event > + kthread needs stopping? kthread is stopped in > + ir_raw_event_unregister() */ > + return 0; > +} > + > +static int em28xx_ir_resume(struct em28xx *dev) > +{ > + struct em28xx_IR *ir = dev->ir; > + > + if (dev->is_audio_only) > + return 0; > + > + em28xx_info("Resuming input extension"); > + /* if suspend calls ir_raw_event_unregister(), the should call > + ir_raw_event_register() */ > + schedule_delayed_work_sync(&ir->work); This causes a compilation breakage: drivers/media/usb/em28xx/em28xx-input.c: In function ‘em28xx_ir_resume’: drivers/media/usb/em28xx/em28xx-input.c:856:2: error: implicit declaration of function ‘schedule_delayed_work_sync’ [-Werror=implicit-function-declaration] schedule_delayed_work_sync(&ir->work); > + if (dev->num_button_polling_addresses) > + schedule_delayed_work(&dev->buttons_query_work, > + msecs_to_jiffies(dev->button_polling_interval)); > + return 0; > +} > + > static struct em28xx_ops rc_ops = { > .id = EM28XX_RC, > .name = "Em28xx Input Extension", > .init = em28xx_ir_init, > .fini = em28xx_ir_fini, > + .suspend = em28xx_ir_suspend, > + .resume = em28xx_ir_resume, > }; > > static int __init em28xx_rc_register(void)
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index 18f65d8..1227309 100644 --- a/drivers/media/usb/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c @@ -827,11 +827,46 @@ static int em28xx_ir_fini(struct em28xx *dev) return 0; } +static int em28xx_ir_suspend(struct em28xx *dev) +{ + struct em28xx_IR *ir = dev->ir; + + if (dev->is_audio_only) + return 0; + + em28xx_info("Suspending input extension"); + cancel_delayed_work_sync(&ir->work); + cancel_delayed_work_sync(&dev->buttons_query_work); + /* is canceling delayed work sufficient or does the rc event + kthread needs stopping? kthread is stopped in + ir_raw_event_unregister() */ + return 0; +} + +static int em28xx_ir_resume(struct em28xx *dev) +{ + struct em28xx_IR *ir = dev->ir; + + if (dev->is_audio_only) + return 0; + + em28xx_info("Resuming input extension"); + /* if suspend calls ir_raw_event_unregister(), the should call + ir_raw_event_register() */ + schedule_delayed_work_sync(&ir->work); + if (dev->num_button_polling_addresses) + schedule_delayed_work(&dev->buttons_query_work, + msecs_to_jiffies(dev->button_polling_interval)); + return 0; +} + static struct em28xx_ops rc_ops = { .id = EM28XX_RC, .name = "Em28xx Input Extension", .init = em28xx_ir_init, .fini = em28xx_ir_fini, + .suspend = em28xx_ir_suspend, + .resume = em28xx_ir_resume, }; static int __init em28xx_rc_register(void)
Implement em28xx_ops: suspend/resume hooks. em28xx usb driver will invoke em28xx_ops: suspend and resume hooks for all its extensions from its suspend() and resume() interfaces. Signed-off-by: Shuah Khan <shuah.kh@samsung.com> --- drivers/media/usb/em28xx/em28xx-input.c | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)