USB: remove CONFIG_USB_SUSPEND from Documentation

An earlier patch removed the CONFIG_USB_SUSPEND symbol but forgot to
update the Documentation files.  This patch (as1676) rectifies that
omission.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index c8baaf53594a862fb8be7fadd880cb534de8acea..f093e59cbe5f017531b74ce45dcc3d130ddfd44d 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -32,7 +32,7 @@ Date:         January 2008
 KernelVersion: 2.6.25
 Contact:       Sarah Sharp <sarah.a.sharp@intel.com>
 Description:
-               If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
+               If CONFIG_PM_RUNTIME is enabled then this file
                is present.  When read, it returns the total time (in msec)
                that the USB device has been connected to the machine.  This
                file is read-only.
@@ -45,7 +45,7 @@ Date:         January 2008
 KernelVersion: 2.6.25
 Contact:       Sarah Sharp <sarah.a.sharp@intel.com>
 Description:
-               If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
+               If CONFIG_PM_RUNTIME is enabled then this file
                is present.  When read, it returns the total time (in msec)
                that the USB device has been active, i.e. not in a suspended
                state.  This file is read-only.
@@ -187,7 +187,7 @@ What:               /sys/bus/usb/devices/.../power/usb2_hardware_lpm
 Date:          September 2011
 Contact:       Andiry Xu <andiry.xu@amd.com>
 Description:
-               If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device
+               If CONFIG_PM_RUNTIME is set and a USB 2.0 lpm-capable device
                is plugged in to a xHCI host which support link PM, it will
                perform a LPM test; if the test is passed and host supports
                USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will

diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt
index 4204eb01fd3839187da2d20654a39f1f9a134b7e..1392b61d6ebe59c87bbe616cc4a9796cba9a160f 100644 (file)
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
@@ -33,6 +33,10 @@ built with CONFIG_USB_SUSPEND enabled (which depends on
 CONFIG_PM_RUNTIME).  System PM support is present only if the kernel
 was built with CONFIG_SUSPEND or CONFIG_HIBERNATION enabled.
 
+(Starting with the 3.10 kernel release, dynamic PM support for USB is
+present whenever the kernel was built with CONFIG_PM_RUNTIME enabled.
+The CONFIG_USB_SUSPEND option has been eliminated.)
+
 
        What is Remote Wakeup?
        ----------------------
@@ -206,10 +210,8 @@ initialized to 5.  (The idle-delay values for already existing devices
 will not be affected.)
 
 Setting the initial default idle-delay to -1 will prevent any
-autosuspend of any USB device.  This is a simple alternative to
-disabling CONFIG_USB_SUSPEND and rebuilding the kernel, and it has the
-added benefit of allowing you to enable autosuspend for selected
-devices.
+autosuspend of any USB device.  This has the benefit of allowing you
+then to enable autosuspend for selected devices.
 
 
        Warnings