diff options
Diffstat (limited to 'drivers/usb/core/driver.c')
-rw-r--r-- | drivers/usb/core/driver.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 38072e4e74bd..e35a17687c05 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -1646,7 +1646,7 @@ static int autosuspend_check(struct usb_device *udev) | |||
1646 | return 0; | 1646 | return 0; |
1647 | } | 1647 | } |
1648 | 1648 | ||
1649 | static int usb_runtime_suspend(struct device *dev) | 1649 | int usb_runtime_suspend(struct device *dev) |
1650 | { | 1650 | { |
1651 | struct usb_device *udev = to_usb_device(dev); | 1651 | struct usb_device *udev = to_usb_device(dev); |
1652 | int status; | 1652 | int status; |
@@ -1667,7 +1667,7 @@ static int usb_runtime_suspend(struct device *dev) | |||
1667 | return status; | 1667 | return status; |
1668 | } | 1668 | } |
1669 | 1669 | ||
1670 | static int usb_runtime_resume(struct device *dev) | 1670 | int usb_runtime_resume(struct device *dev) |
1671 | { | 1671 | { |
1672 | struct usb_device *udev = to_usb_device(dev); | 1672 | struct usb_device *udev = to_usb_device(dev); |
1673 | int status; | 1673 | int status; |
@@ -1679,7 +1679,7 @@ static int usb_runtime_resume(struct device *dev) | |||
1679 | return status; | 1679 | return status; |
1680 | } | 1680 | } |
1681 | 1681 | ||
1682 | static int usb_runtime_idle(struct device *dev) | 1682 | int usb_runtime_idle(struct device *dev) |
1683 | { | 1683 | { |
1684 | struct usb_device *udev = to_usb_device(dev); | 1684 | struct usb_device *udev = to_usb_device(dev); |
1685 | 1685 | ||
@@ -1691,19 +1691,10 @@ static int usb_runtime_idle(struct device *dev) | |||
1691 | return 0; | 1691 | return 0; |
1692 | } | 1692 | } |
1693 | 1693 | ||
1694 | static const struct dev_pm_ops usb_bus_pm_ops = { | ||
1695 | .runtime_suspend = usb_runtime_suspend, | ||
1696 | .runtime_resume = usb_runtime_resume, | ||
1697 | .runtime_idle = usb_runtime_idle, | ||
1698 | }; | ||
1699 | |||
1700 | #endif /* CONFIG_USB_SUSPEND */ | 1694 | #endif /* CONFIG_USB_SUSPEND */ |
1701 | 1695 | ||
1702 | struct bus_type usb_bus_type = { | 1696 | struct bus_type usb_bus_type = { |
1703 | .name = "usb", | 1697 | .name = "usb", |
1704 | .match = usb_device_match, | 1698 | .match = usb_device_match, |
1705 | .uevent = usb_uevent, | 1699 | .uevent = usb_uevent, |
1706 | #ifdef CONFIG_USB_SUSPEND | ||
1707 | .pm = &usb_bus_pm_ops, | ||
1708 | #endif | ||
1709 | }; | 1700 | }; |