[PATCH] xen: new power management driver calls

[PATCH] xen: new power management driver calls

[Thadeu Lima de Souza Cascardo]

linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because
xen_suspend calls device_power_up and device_resume, which require a
parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.
---
 drivers/xen/manage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 5b546e3..64c554e 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	device_power_up();
+	device_power_up(PMSG_RESUME);
 
 	if (!*cancelled) {
 		xen_irq_resume();
@@ -112,7 +112,7 @@ static void do_suspend(void)
 	else
 		xenbus_suspend_cancel();
 
-	device_resume();
+	device_resume(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();
-- 
1.5.6

Re: [PATCH] xen: new power management driver calls

[Jeremy Fitzhardinge]

Thadeu Lima de Souza Cascardo wrote:
> linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because
> xen_suspend calls device_power_up and device_resume, which require a
> parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.
>   

Someone (Randy?) reported this before, but then I quietly forgot all 
about it.  Thanks for the patch.

Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

    J

> ---
>  drivers/xen/manage.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
> index 5b546e3..64c554e 100644
> --- a/drivers/xen/manage.c
> +++ b/drivers/xen/manage.c
> @@ -63,7 +63,7 @@ static int xen_suspend(void *data)
>  	gnttab_resume();
>  	xen_mm_unpin_all();
>  
> -	device_power_up();
> +	device_power_up(PMSG_RESUME);
>  
>  	if (!*cancelled) {
>  		xen_irq_resume();
> @@ -112,7 +112,7 @@ static void do_suspend(void)
>  	else
>  		xenbus_suspend_cancel();
>  
> -	device_resume();
> +	device_resume(PMSG_RESUME);
>  
>  	/* Make sure timer events get retriggered on all CPUs */
>  	clock_was_set();
>   

Re: [PATCH] xen: new power management driver calls

[Randy Dunlap]

On Tue, 08 Jul 2008 13:18:10 -0700 Jeremy Fitzhardinge wrote:

> Thadeu Lima de Souza Cascardo wrote:
> > linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because
> > xen_suspend calls device_power_up and device_resume, which require a
> > parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.
> >   
> 
> Someone (Randy?) reported this before, but then I quietly forgot all 
> about it.  Thanks for the patch.
> 
> Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks.


>     J
> 
> > ---
> >  drivers/xen/manage.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
> > index 5b546e3..64c554e 100644
> > --- a/drivers/xen/manage.c
> > +++ b/drivers/xen/manage.c
> > @@ -63,7 +63,7 @@ static int xen_suspend(void *data)
> >  	gnttab_resume();
> >  	xen_mm_unpin_all();
> >  
> > -	device_power_up();
> > +	device_power_up(PMSG_RESUME);
> >  
> >  	if (!*cancelled) {
> >  		xen_irq_resume();
> > @@ -112,7 +112,7 @@ static void do_suspend(void)
> >  	else
> >  		xenbus_suspend_cancel();
> >  
> > -	device_resume();
> > +	device_resume(PMSG_RESUME);
> >  
> >  	/* Make sure timer events get retriggered on all CPUs */
> >  	clock_was_set();
> >   


---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/