1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index 64565aac6e4..3384d5996be 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -506,8 +506,8 @@ routines.  Nevertheless, different callback pointers are used in case there is a
 situation where it actually matters.
-Device Power Domains
+Device Power Management Domains
--------------------
+-------------------------------
 Sometimes devices share reference clocks or other power resources.  In those
 cases it generally is not possible to put devices into low-power states
 individually.  Instead, a set of devices sharing a power resource can be put
@@ -516,8 +516,8 @@ power resource.  Of course, they also need to be put into the full-power state
 together, by turning the shared power resource on.  A set of devices with this
 property is often referred to as a power domain.
-Support for power domains is provided through the pwr_domain field of struct
+Support for power domains is provided through the pm_domain field of struct
-device.  This field is a pointer to an object of type struct dev_power_domain,
+device.  This field is a pointer to an object of type struct dev_pm_domain,
 defined in include/linux/pm.h, providing a set of power management callbacks
 analogous to the subsystem-level and device driver callbacks that are executed
 for the given device during all power transitions, instead of the respective
@@ -604,7 +604,7 @@ state temporarily, for example so that its system wakeup capability can be
 disabled.  This all depends on the hardware and the design of the subsystem and
 device driver in question.
-During system-wide resume from a sleep state it's best to put devices into the
+During system-wide resume from a sleep state it's easiest to put devices into
-full-power state, as explained in Documentation/power/runtime_pm.txt.  Refer to
+the full-power state, as explained in Documentation/power/runtime_pm.txt.  Refer
-that document for more information regarding this particular issue as well as
+to that document for more information regarding this particular issue as well as
 for information on the device runtime power management framework in general.

diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt index 64565aac6e4..3384d5996be 100644 --- a/Documentation/power/devices.txt +++ b/Documentation/power/devices.txt
@@ -506,8 +506,8 @@ routines. Nevertheless, different callback pointers are used in case there is a
506	situation where it actually matters.	506	situation where it actually matters.
507		507
508		508
509	Device Power Domains	509	Device Power Management Domains
510	--------------------	510	-------------------------------
511	Sometimes devices share reference clocks or other power resources. In those	511	Sometimes devices share reference clocks or other power resources. In those
512	cases it generally is not possible to put devices into low-power states	512	cases it generally is not possible to put devices into low-power states
513	individually. Instead, a set of devices sharing a power resource can be put	513	individually. Instead, a set of devices sharing a power resource can be put
@@ -516,8 +516,8 @@ power resource. Of course, they also need to be put into the full-power state
516	together, by turning the shared power resource on. A set of devices with this	516	together, by turning the shared power resource on. A set of devices with this
517	property is often referred to as a power domain.	517	property is often referred to as a power domain.
518		518
519	Support for power domains is provided through the pwr_domain field of struct	519	Support for power domains is provided through the pm_domain field of struct
520	device. This field is a pointer to an object of type struct dev_power_domain,	520	device. This field is a pointer to an object of type struct dev_pm_domain,
521	defined in include/linux/pm.h, providing a set of power management callbacks	521	defined in include/linux/pm.h, providing a set of power management callbacks
522	analogous to the subsystem-level and device driver callbacks that are executed	522	analogous to the subsystem-level and device driver callbacks that are executed
523	for the given device during all power transitions, instead of the respective	523	for the given device during all power transitions, instead of the respective
@@ -604,7 +604,7 @@ state temporarily, for example so that its system wakeup capability can be
604	disabled. This all depends on the hardware and the design of the subsystem and	604	disabled. This all depends on the hardware and the design of the subsystem and
605	device driver in question.	605	device driver in question.
606		606
607	During system-wide resume from a sleep state it's best to put devices into the	607	During system-wide resume from a sleep state it's easiest to put devices into
608	full-power state, as explained in Documentation/power/runtime_pm.txt. Refer to	608	the full-power state, as explained in Documentation/power/runtime_pm.txt. Refer
609	that document for more information regarding this particular issue as well as	609	to that document for more information regarding this particular issue as well as
610	for information on the device runtime power management framework in general.	610	for information on the device runtime power management framework in general.