aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/u132-hcd.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-03-27 16:14:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 14:10:22 -0400
commit84ebc10294a3d7be4c66f51070b7aedbaa24de9b (patch)
tree36fc8e5387474ee3b47f6ed4224cb491e1ea7155 /drivers/usb/host/u132-hcd.c
parent0aa2832dd0d9d8609fd8f15139bc7572541a1215 (diff)
USB: remove CONFIG_USB_SUSPEND option
This patch (as1675) removes the CONFIG_USB_SUSPEND option, essentially replacing it everywhere with CONFIG_PM_RUNTIME (except for one place in hub.c, where it is replaced with CONFIG_PM because the code needs to be used in both runtime and system PM). The net result is code shrinkage and simplification. There's very little point in keeping CONFIG_USB_SUSPEND because almost everybody enables it. The few that don't will find that the usbcore module has gotten somewhat bigger and they will have to take active measures if they want to prevent hubs from being runtime suspended. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: Peter Chen <peter.chen@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/u132-hcd.c')
-rw-r--r--drivers/usb/host/u132-hcd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 5efdffe32365..5c124bf5d018 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -3141,10 +3141,11 @@ static int u132_probe(struct platform_device *pdev)
3141 3141
3142 3142
3143#ifdef CONFIG_PM 3143#ifdef CONFIG_PM
3144/* for this device there's no useful distinction between the controller 3144/*
3145* and its root hub, except that the root hub only gets direct PM calls 3145 * for this device there's no useful distinction between the controller
3146* when CONFIG_USB_SUSPEND is enabled. 3146 * and its root hub, except that the root hub only gets direct PM calls
3147*/ 3147 * when CONFIG_PM_RUNTIME is enabled.
3148 */
3148static int u132_suspend(struct platform_device *pdev, pm_message_t state) 3149static int u132_suspend(struct platform_device *pdev, pm_message_t state)
3149{ 3150{
3150 struct usb_hcd *hcd = platform_get_drvdata(pdev); 3151 struct usb_hcd *hcd = platform_get_drvdata(pdev);