[PATCH][RFC] pm: remove device_type suspend()/resume()

[PATCH][RFC] pm: remove device_type suspend()/resume()

[Magnus Damm]

From: Magnus Damm <damm@igel.co.jp>

This patch removes the legacy callbacks ->suspend() and
->resume() from struct device_type. These callbacks seem
unused, and new code should instead make use of struct
dev_pm_ops.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 Only lightly compile tested on my laptop, could use some
 multi-arch build farm verification.

 drivers/base/power/main.c |    7 -------
 include/linux/device.h    |    3 ---
 2 files changed, 10 deletions(-)

--- 0001/drivers/base/power/main.c
+++ work/drivers/base/power/main.c	2009-06-01 17:07:23.000000000 +0900
@@ -399,9 +399,6 @@ static int device_resume(struct device *
 		if (dev->type->pm) {
 			pm_dev_dbg(dev, state, "type ");
 			error = pm_op(dev, dev->type->pm, state);
-		} else if (dev->type->resume) {
-			pm_dev_dbg(dev, state, "legacy type ");
-			error = dev->type->resume(dev);
 		}
 		if (error)
 			goto End;
@@ -641,10 +638,6 @@ static int device_suspend(struct device 
 		if (dev->type->pm) {
 			pm_dev_dbg(dev, state, "type ");
 			error = pm_op(dev, dev->type->pm, state);
-		} else if (dev->type->suspend) {
-			pm_dev_dbg(dev, state, "legacy type ");
-			error = dev->type->suspend(dev, state);
-			suspend_report_result(dev->type->suspend, error);
 		}
 		if (error)
 			goto End;
--- 0001/include/linux/device.h
+++ work/include/linux/device.h	2009-06-01 17:00:20.000000000 +0900
@@ -293,9 +293,6 @@ struct device_type {
 	char *(*nodename)(struct device *dev);
 	void (*release)(struct device *dev);
 
-	int (*suspend)(struct device *dev, pm_message_t state);
-	int (*resume)(struct device *dev);
-
 	struct dev_pm_ops *pm;
 };
 

Re: [PATCH][RFC] pm: remove device_type suspend()/resume()

[Rafael J. Wysocki]

On Monday 01 June 2009, Magnus Damm wrote:
> From: Magnus Damm <damm@igel.co.jp>
> 
> This patch removes the legacy callbacks ->suspend() and
> ->resume() from struct device_type. These callbacks seem
> unused, and new code should instead make use of struct
> dev_pm_ops.
> 
> Signed-off-by: Magnus Damm <damm@igel.co.jp>

This is fine by me.

Greg, Pavel, Alan, any objections?

Rafael


> ---
> 
>  Only lightly compile tested on my laptop, could use some
>  multi-arch build farm verification.
> 
>  drivers/base/power/main.c |    7 -------
>  include/linux/device.h    |    3 ---
>  2 files changed, 10 deletions(-)
> 
> --- 0001/drivers/base/power/main.c
> +++ work/drivers/base/power/main.c	2009-06-01 17:07:23.000000000 +0900
> @@ -399,9 +399,6 @@ static int device_resume(struct device *
>  		if (dev->type->pm) {
>  			pm_dev_dbg(dev, state, "type ");
>  			error = pm_op(dev, dev->type->pm, state);
> -		} else if (dev->type->resume) {
> -			pm_dev_dbg(dev, state, "legacy type ");
> -			error = dev->type->resume(dev);
>  		}
>  		if (error)
>  			goto End;
> @@ -641,10 +638,6 @@ static int device_suspend(struct device 
>  		if (dev->type->pm) {
>  			pm_dev_dbg(dev, state, "type ");
>  			error = pm_op(dev, dev->type->pm, state);
> -		} else if (dev->type->suspend) {
> -			pm_dev_dbg(dev, state, "legacy type ");
> -			error = dev->type->suspend(dev, state);
> -			suspend_report_result(dev->type->suspend, error);
>  		}
>  		if (error)
>  			goto End;
> --- 0001/include/linux/device.h
> +++ work/include/linux/device.h	2009-06-01 17:00:20.000000000 +0900
> @@ -293,9 +293,6 @@ struct device_type {
>  	char *(*nodename)(struct device *dev);
>  	void (*release)(struct device *dev);
>  
> -	int (*suspend)(struct device *dev, pm_message_t state);
> -	int (*resume)(struct device *dev);
> -
>  	struct dev_pm_ops *pm;
>  };

Re: [PATCH][RFC] pm: remove device_type suspend()/resume()

[Alan Stern]

On Mon, 1 Jun 2009, Rafael J. Wysocki wrote:

> On Monday 01 June 2009, Magnus Damm wrote:
> > From: Magnus Damm <damm@igel.co.jp>
> > 
> > This patch removes the legacy callbacks ->suspend() and
> > ->resume() from struct device_type. These callbacks seem
> > unused, and new code should instead make use of struct
> > dev_pm_ops.
> > 
> > Signed-off-by: Magnus Damm <damm@igel.co.jp>
> 
> This is fine by me.
> 
> Greg, Pavel, Alan, any objections?

No objections from me.

Alan Stern

Re: [PATCH][RFC] pm: remove device_type suspend()/resume()

[Pavel Machek]

On Mon 2009-06-01 20:40:57, Rafael J. Wysocki wrote:
> On Monday 01 June 2009, Magnus Damm wrote:
> > From: Magnus Damm <damm@igel.co.jp>
> > 
> > This patch removes the legacy callbacks ->suspend() and
> > ->resume() from struct device_type. These callbacks seem
> > unused, and new code should instead make use of struct
> > dev_pm_ops.
> > 
> > Signed-off-by: Magnus Damm <damm@igel.co.jp>
> 
> This is fine by me.
> 
> Greg, Pavel, Alan, any objections?

Ok with me.

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH][RFC] pm: remove device_type suspend()/resume()

[Greg KH]

On Mon, Jun 01, 2009 at 08:40:57PM +0200, Rafael J. Wysocki wrote:
> On Monday 01 June 2009, Magnus Damm wrote:
> > From: Magnus Damm <damm@igel.co.jp>
> > 
> > This patch removes the legacy callbacks ->suspend() and
> > ->resume() from struct device_type. These callbacks seem
> > unused, and new code should instead make use of struct
> > dev_pm_ops.
> > 
> > Signed-off-by: Magnus Damm <damm@igel.co.jp>
> 
> This is fine by me.
> 
> Greg, Pavel, Alan, any objections?

Nope:
	Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

Re: [PATCH][RFC] pm: remove device_type suspend()/resume()

[Rafael J. Wysocki]

On Monday 01 June 2009, Greg KH wrote:
> On Mon, Jun 01, 2009 at 08:40:57PM +0200, Rafael J. Wysocki wrote:
> > On Monday 01 June 2009, Magnus Damm wrote:
> > > From: Magnus Damm <damm@igel.co.jp>
> > > 
> > > This patch removes the legacy callbacks ->suspend() and
> > > ->resume() from struct device_type. These callbacks seem
> > > unused, and new code should instead make use of struct
> > > dev_pm_ops.
> > > 
> > > Signed-off-by: Magnus Damm <damm@igel.co.jp>
> > 
> > This is fine by me.
> > 
> > Greg, Pavel, Alan, any objections?
> 
> Nope:
> 	Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

Great, thanks!

if you don't mind, I'm going to take it to my tree.

Best,
Rafael