[RFC,4/6] media: em28xx-input - implement em28xx_ops: suspend/resume hooks

Commit Message

Mauro Carvalho Chehab March 3, 2014, 9:45 a.m. UTC

Em Sat, 01 Mar 2014 10:48:35 -0300
Mauro Carvalho Chehab <[e-mail]> escreveu:

> Em Fri, 21 Feb 2014 17:50:16 -0700
> Shuah Khan <[e-mail]> 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 <[e-mail]>
> > ---
> >  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);
> 

Ok, I reworked it fixing the above compilation bug, and added a test to
be sure that IR is enabled before using ir->work.

Patch enclosed.

This series look OK on my eyes with this change, and it worked fine
here with PCTV 80e, so I'll be merging it. In any case, this won't
cause any regressions, as suspending before those patches on those 
devices make the machine to hang.

Regards,
Mauro

From: Shuah Khan <[e-mail]>
Date: Fri, 21 Feb 2014 21:50:16 -0300
Subject: [PATCH] [media] em28xx-input: implement em28xx_ops: suspend/resume
 hooks

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.

[[e-mail]: Fix a breakage caused by calling a non-existing
 function call: schedule_delayed_work_sync(), and test if IR was defined
 at suspend/resume]
Signed-off-by: Shuah Khan <[e-mail]>
Signed-off-by: Mauro Carvalho Chehab <[e-mail]>

Patch

diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 048e5b680499..47a2c1dcccbf 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -827,11 +827,48 @@  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");
+	if (ir)
+		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() */
+	if (ir)
+		schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
+	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)