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

Commit 947ec0b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Add empty suspend/resume device irq functions
  PM/Hibernate: Move NVS routines into a seperate file (v2).
  PM/Hibernate: Rename disk.c to hibernate.c
  PM: Separate suspend to RAM functionality from core
  Driver Core: Rework platform suspend/resume, print warning
  PM: Remove device_type suspend()/resume()
  PM/Hibernate: Move memory shrinking to snapshot.c (rev. 2)
  PM/Suspend: Do not shrink memory before suspend
  PM: Remove bus_type suspend_late()/resume_early() V2
  PM core: rename suspend and resume functions
  PM: Rename device_power_down/up()
  PM: Remove unused asm/suspend.h
  x86: unify power/cpu_(32|64).c
  x86: unify power/cpu_(32|64) copyright notes
  x86: unify power/cpu_(32|64) regarding restoring processor state
  x86: unify power/cpu_(32|64) regarding saving processor state
  x86: unify power/cpu_(32|64) global variables
  x86: unify power/cpu_(32|64) headers
  PM: Warn if interrupts are enabled during suspend-resume of sysdevs
  PM/ACPI/x86: Fix sparse warning in arch/x86/kernel/acpi/sleep.c
parents c53567ad 5818a6e2

Documentation/power/devices.txt

+5 −29
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ may need to apply in domain-specific ways to their devices: 
struct bus_type {

	...

	int  (*suspend)(struct device *dev, pm_message_t state);

	int  (*suspend_late)(struct device *dev, pm_message_t state);



	int  (*resume_early)(struct device *dev);

	int  (*resume)(struct device *dev);

};
@@ -226,20 +223,7 @@ The phases are seen by driver notifications issued in this order: 


	This call should handle parts of device suspend logic that require

	sleeping.  It probably does work to quiesce the device which hasn't

	been abstracted into class.suspend() or bus.suspend_late().



   3	bus.suspend_late(dev, message) is called with IRQs disabled, and

	with only one CPU active.  Until the bus.resume_early() phase

	completes (see later), IRQs are not enabled again.  This method

	won't be exposed by all busses; for message based busses like USB,

	I2C, or SPI, device interactions normally require IRQs.  This bus

	call may be morphed into a driver call with bus-specific parameters.



	This call might save low level hardware state that might otherwise

	be lost in the upcoming low power state, and actually put the

	device into a low power state ... so that in some cases the device

	may stay partly usable until this late.  This "late" call may also

	help when coping with hardware that behaves badly.

	been abstracted into class.suspend().



The pm_message_t parameter is currently used to refine those semantics

(described later).
@@ -351,19 +335,11 @@ devices processing each phase's calls before the next phase begins. 


The phases are seen by driver notifications issued in this order:



   1	bus.resume_early(dev) is called with IRQs disabled, and with

   	only one CPU active.  As with bus.suspend_late(), this method

	won't be supported on busses that require IRQs in order to

	interact with devices.



	This reverses the effects of bus.suspend_late().



   2	bus.resume(dev) is called next.  This may be morphed into a device

   	driver call with bus-specific parameters; implementations may sleep.



	This reverses the effects of bus.suspend().

   1	bus.resume(dev) reverses the effects of bus.suspend().  This may

	be morphed into a device driver call with bus-specific parameters;

	implementations may sleep.



   3	class.resume(dev) is called for devices associated with a class

   2	class.resume(dev) is called for devices associated with a class

	that has such a method.  Implementations may sleep.



	This reverses the effects of class.suspend(), and would usually

arch/alpha/include/asm/suspend.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ALPHA_SUSPEND_H

#define __ALPHA_SUSPEND_H



/* Dummy include. */



#endif  /* __ALPHA_SUSPEND_H */

arch/arm/include/asm/suspend.h

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
#ifndef _ASMARM_SUSPEND_H

#define _ASMARM_SUSPEND_H



#endif

arch/ia64/include/asm/suspend.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
/* dummy (must be non-empty to prevent prejudicial removal...) */

arch/m68k/include/asm/suspend.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _M68K_SUSPEND_H

#define _M68K_SUSPEND_H



/* Dummy include. */



#endif  /* _M68K_SUSPEND_H */