UPSTREAM: usb: dwc3: core: get rid of DWC3_PM_OPS macro
authorFelipe Balbi <felipe.balbi@linux.intel.com>
Mon, 9 May 2016 12:27:01 +0000 (15:27 +0300)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 16 Aug 2016 12:48:19 +0000 (20:48 +0800)
that macro is unnecessary and just adds pointless
obfuscation. Let's remove it.

Change-Id: I67e73c5a6c6155fc66c1ac05047173c0e783b205
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(cherry picked from commit 7f370ed0cfe9aa1520696c1c71e8a51e2c0bbcc1)

drivers/usb/dwc3/core.c

index 9084908d39395e0ac310297b7da15d08bbb3d677..201357772402452bb060a846e9ca4e121d5fe74f 100644 (file)
@@ -1201,16 +1201,12 @@ err_usb2phy_power:
 
        return ret;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static const struct dev_pm_ops dwc3_dev_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
 };
 
-#define DWC3_PM_OPS    &(dwc3_dev_pm_ops)
-#else
-#define DWC3_PM_OPS    NULL
-#endif
-
 #ifdef CONFIG_OF
 static const struct of_device_id of_dwc3_match[] = {
        {
@@ -1242,7 +1238,7 @@ static struct platform_driver dwc3_driver = {
                .name   = "dwc3",
                .of_match_table = of_match_ptr(of_dwc3_match),
                .acpi_match_table = ACPI_PTR(dwc3_acpi_match),
-               .pm     = DWC3_PM_OPS,
+               .pm     = &dwc3_dev_pm_ops,
        },
 };