Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95d9ffbe authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

PM: Move definition of struct pm_ops to suspend.h 



Move the definition of 'struct pm_ops' and related functions from <linux/pm.h>
to <linux/suspend.h> .

There are, at least, the following reasons to do that:
* 'struct pm_ops' is specifically related to suspend and not to the power
  management in general.
* As long as 'struct pm_ops' is defined in <linux/pm.h>, any modification of it
  causes the entire kernel to be recompiled, which is unnecessary and annoying.
* Some suspend-related features are already defined in <linux/suspend.h>, so it
  is logical to move the definition of 'struct pm_ops' into there.
* 'struct hibernation_ops', being the hibernation-related counterpart of
  'struct pm_ops', is defined in <linux/suspend.h> .

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a065c86e

arch/arm/common/sharpsl_pm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/leds.h>

#include <linux/leds.h>

#include <linux/apm-emulation.h>

#include <linux/apm-emulation.h>

#include <linux/suspend.h>





#include <asm/hardware.h>

#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

arch/arm/mach-at91/pm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -10,10 +10,9 @@ 
 * (at your option) any later version.

 * (at your option) any later version.

 */

 */





#include <linux/pm.h>

#include <linux/suspend.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/proc_fs.h>

#include <linux/proc_fs.h>

#include <linux/pm.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/sysfs.h>

#include <linux/sysfs.h>

#include <linux/module.h>

#include <linux/module.h>

arch/arm/mach-omap1/pm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -35,10 +35,9 @@ 
 * 675 Mass Ave, Cambridge, MA 02139, USA.

 * 675 Mass Ave, Cambridge, MA 02139, USA.

 */

 */





#include <linux/pm.h>

#include <linux/suspend.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/proc_fs.h>

#include <linux/proc_fs.h>

#include <linux/pm.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/sysfs.h>

#include <linux/sysfs.h>

#include <linux/module.h>

#include <linux/module.h>

arch/arm/mach-omap2/pm.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -16,10 +16,9 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





#include <linux/pm.h>

#include <linux/suspend.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/proc_fs.h>

#include <linux/proc_fs.h>

#include <linux/pm.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/sysfs.h>

#include <linux/sysfs.h>

#include <linux/module.h>

#include <linux/module.h>
@@ -85,9 +84,6 @@ static int omap2_pm_prepare(suspend_state_t state) 
	case PM_SUSPEND_MEM:

	case PM_SUSPEND_MEM:

		break;

		break;





	case PM_SUSPEND_DISK:

		return -ENOTSUPP;



	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -353,9 +349,6 @@ static int omap2_pm_enter(suspend_state_t state) 
	case PM_SUSPEND_MEM:

	case PM_SUSPEND_MEM:

		ret = omap2_pm_suspend();

		ret = omap2_pm_suspend();

		break;

		break;

	case PM_SUSPEND_DISK:

		ret = -ENOTSUPP;

		break;

	default:

	default:

		ret = -EINVAL;

		ret = -EINVAL;

	}

	}

arch/arm/mach-pnx4008/pm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/rtc.h>

#include <linux/rtc.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/proc_fs.h>

#include <linux/proc_fs.h>

#include <linux/pm.h>

#include <linux/suspend.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/clk.h>