USB: Add new USB LPM helpers

commit 7529b2574a7aaf902f1f8159fbc2a7caa74be559 upstream.

Use new helpers to make LPM enabling/disabling more clear.

This is a preparation to subsequent patch.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: stable <stable@vger.kernel.org> # after much soaking
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 2f3dbf1c3c2d684915d7915d640aa0c9f1f78a2f..7dc99c9b3ad812797b12b85ef27b274b54761057 100644 (file)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1891,7 +1891,7 @@ int usb_runtime_idle(struct device *dev)
        return -EBUSY;
 }
 
-int usb_set_usb2_hardware_lpm(struct usb_device *udev, int enable)
+static int usb_set_usb2_hardware_lpm(struct usb_device *udev, int enable)
 {
        struct usb_hcd *hcd = bus_to_hcd(udev->bus);
        int ret = -EPERM;
@@ -1908,6 +1908,16 @@ int usb_set_usb2_hardware_lpm(struct usb_device *udev, int enable)
        return ret;
 }
 
+int usb_enable_usb2_hardware_lpm(struct usb_device *udev)
+{
+       return usb_set_usb2_hardware_lpm(udev, 1);
+}
+
+int usb_disable_usb2_hardware_lpm(struct usb_device *udev)
+{
+       return usb_set_usb2_hardware_lpm(udev, 0);
+}
+
 #endif /* CONFIG_PM */
 
 struct bus_type usb_bus_type = {

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 4a4e666a8e09f7930a7b14c95a36f6784f914c2a..9f3a7ca4d72c87349615cd30c77608f0af3ecc92 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3175,7 +3175,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
 
        /* disable USB2 hardware LPM */
        if (udev->usb2_hw_lpm_enabled == 1)
-               usb_set_usb2_hardware_lpm(udev, 0);
+               usb_disable_usb2_hardware_lpm(udev);
 
        if (usb_disable_ltm(udev)) {
                dev_err(&udev->dev, "Failed to disable LTM before suspend\n.");
@@ -3214,7 +3214,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
  err_ltm:
                /* Try to enable USB2 hardware LPM again */
                if (udev->usb2_hw_lpm_capable == 1)
-                       usb_set_usb2_hardware_lpm(udev, 1);
+                       usb_enable_usb2_hardware_lpm(udev);
 
                if (udev->do_remote_wakeup)
                        (void) usb_disable_remote_wakeup(udev);
@@ -3498,7 +3498,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
        } else  {
                /* Try to enable USB2 hardware LPM */
                if (udev->usb2_hw_lpm_capable == 1)
-                       usb_set_usb2_hardware_lpm(udev, 1);
+                       usb_enable_usb2_hardware_lpm(udev);
 
                /* Try to enable USB3 LTM */
                usb_enable_ltm(udev);
@@ -4334,7 +4334,7 @@ static void hub_set_initial_usb2_lpm_policy(struct usb_device *udev)
        if ((udev->bos->ext_cap->bmAttributes & cpu_to_le32(USB_BESL_SUPPORT)) ||
                        connect_type == USB_PORT_CONNECT_TYPE_HARD_WIRED) {
                udev->usb2_hw_lpm_allowed = 1;
-               usb_set_usb2_hardware_lpm(udev, 1);
+               usb_enable_usb2_hardware_lpm(udev);
        }
 }
 
@@ -5492,7 +5492,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
         * It will be re-enabled by the enumeration process.
         */
        if (udev->usb2_hw_lpm_enabled == 1)
-               usb_set_usb2_hardware_lpm(udev, 0);
+               usb_disable_usb2_hardware_lpm(udev);
 
        /* Disable LPM and LTM while we reset the device and reinstall the alt
         * settings.  Device-initiated LPM settings, and system exit latency
@@ -5602,7 +5602,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
 
 done:
        /* Now that the alt settings are re-installed, enable LTM and LPM. */
-       usb_set_usb2_hardware_lpm(udev, 1);
+       usb_enable_usb2_hardware_lpm(udev);
        usb_unlocked_enable_lpm(udev);
        usb_enable_ltm(udev);
        usb_release_bos_descriptor(udev);

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 833ddd228e3a80cc150a484cc683a567df48a62e..f245c654175e85ed312925495349ff846f8b933f 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1183,7 +1183,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
                }
 
                if (dev->usb2_hw_lpm_enabled == 1)
-                       usb_set_usb2_hardware_lpm(dev, 0);
+                       usb_disable_usb2_hardware_lpm(dev);
                usb_unlocked_disable_lpm(dev);
                usb_disable_ltm(dev);
 

diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index d930bfda40101457dad980ec432c0b73d7193981..15c19863f7b34a49a6c3118347322ea5b5309348 100644 (file)
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -508,7 +508,10 @@ static ssize_t usb2_hardware_lpm_store(struct device *dev,
 
        if (!ret) {
                udev->usb2_hw_lpm_allowed = value;
-               ret = usb_set_usb2_hardware_lpm(udev, value);
+               if (value)
+                       ret = usb_enable_usb2_hardware_lpm(udev);
+               else
+                       ret = usb_disable_usb2_hardware_lpm(udev);
        }
 
        usb_unlock_device(udev);

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index dc69492488234141b9980fee41045b5461da206d..1b5f346d93ebb68a75b50295ecaee7050e0d7f2d 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -89,7 +89,8 @@ extern int usb_remote_wakeup(struct usb_device *dev);
 extern int usb_runtime_suspend(struct device *dev);
 extern int usb_runtime_resume(struct device *dev);
 extern int usb_runtime_idle(struct device *dev);
-extern int usb_set_usb2_hardware_lpm(struct usb_device *udev, int enable);
+extern int usb_enable_usb2_hardware_lpm(struct usb_device *udev);
+extern int usb_disable_usb2_hardware_lpm(struct usb_device *udev);
 
 #else
 
@@ -109,7 +110,12 @@ static inline int usb_autoresume_device(struct usb_device *udev)
        return 0;
 }
 
-static inline int usb_set_usb2_hardware_lpm(struct usb_device *udev, int enable)
+static inline int usb_enable_usb2_hardware_lpm(struct usb_device *udev)
+{
+       return 0;
+}
+
+static inline int usb_disable_usb2_hardware_lpm(struct usb_device *udev)
 {
        return 0;
 }