diff options
author | David Brownell <david-b@pacbell.net> | 2005-09-23 01:45:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:47:41 -0400 |
commit | 5edbfb7c8af0577097dae87cdd4dfdba82bb9579 (patch) | |
tree | 497ba94999eb10524dd0d6d98ba708e83cae75d8 /drivers/usb/core | |
parent | ccdcf77ae32e3d3347fdf3810b27f899e98c34fb (diff) |
[PATCH] stop exporting two functions
The way we're looking at USB suspend lately doesn't expect drivers to
call usb_suspend_device() or usb_resume_device() directly; that'll
be implicit when no interfaces are in use.
This patch removes those APIs from visibility outside usbcore.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
drivers/usb/core/hub.c | 12 ++++--------
drivers/usb/core/usb.h | 4 ++++
include/linux/usb.h | 5 -----
3 files changed, 8 insertions(+), 13 deletions(-)
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hub.c | 12 | ||||
-rw-r--r-- | drivers/usb/core/usb.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 6a601a4547e7..15db5e490aa2 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1652,10 +1652,10 @@ static int __usb_suspend_device (struct usb_device *udev, int port1) | |||
1652 | 1652 | ||
1653 | #endif | 1653 | #endif |
1654 | 1654 | ||
1655 | /** | 1655 | /* |
1656 | * usb_suspend_device - suspend a usb device | 1656 | * usb_suspend_device - suspend a usb device |
1657 | * @udev: device that's no longer in active use | 1657 | * @udev: device that's no longer in active use |
1658 | * Context: must be able to sleep; device not locked | 1658 | * Context: must be able to sleep; device not locked; pm locks held |
1659 | * | 1659 | * |
1660 | * Suspends a USB device that isn't in active use, conserving power. | 1660 | * Suspends a USB device that isn't in active use, conserving power. |
1661 | * Devices may wake out of a suspend, if anything important happens, | 1661 | * Devices may wake out of a suspend, if anything important happens, |
@@ -1820,10 +1820,10 @@ hub_port_resume(struct usb_hub *hub, int port1, struct usb_device *udev) | |||
1820 | 1820 | ||
1821 | #endif | 1821 | #endif |
1822 | 1822 | ||
1823 | /** | 1823 | /* |
1824 | * usb_resume_device - re-activate a suspended usb device | 1824 | * usb_resume_device - re-activate a suspended usb device |
1825 | * @udev: device to re-activate | 1825 | * @udev: device to re-activate |
1826 | * Context: must be able to sleep; device not locked | 1826 | * Context: must be able to sleep; device not locked; pm locks held |
1827 | * | 1827 | * |
1828 | * This will re-activate the suspended device, increasing power usage | 1828 | * This will re-activate the suspended device, increasing power usage |
1829 | * while letting drivers communicate again with its endpoints. | 1829 | * while letting drivers communicate again with its endpoints. |
@@ -2024,10 +2024,6 @@ void usb_resume_root_hub(struct usb_device *hdev) | |||
2024 | kick_khubd(hub); | 2024 | kick_khubd(hub); |
2025 | } | 2025 | } |
2026 | 2026 | ||
2027 | EXPORT_SYMBOL(usb_suspend_device); | ||
2028 | EXPORT_SYMBOL(usb_resume_device); | ||
2029 | |||
2030 | |||
2031 | 2027 | ||
2032 | /* USB 2.0 spec, 7.1.7.3 / fig 7-29: | 2028 | /* USB 2.0 spec, 7.1.7.3 / fig 7-29: |
2033 | * | 2029 | * |
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 7add46ecc6a2..4d59f6e07999 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h | |||
@@ -29,6 +29,10 @@ extern void usb_major_cleanup(void); | |||
29 | extern int usb_host_init(void); | 29 | extern int usb_host_init(void); |
30 | extern void usb_host_cleanup(void); | 30 | extern void usb_host_cleanup(void); |
31 | 31 | ||
32 | extern int usb_suspend_device(struct usb_device *dev); | ||
33 | extern int usb_resume_device(struct usb_device *dev); | ||
34 | |||
35 | |||
32 | /* Interfaces and their "power state" are owned by usbcore */ | 36 | /* Interfaces and their "power state" are owned by usbcore */ |
33 | 37 | ||
34 | static inline void mark_active(struct usb_interface *f) | 38 | static inline void mark_active(struct usb_interface *f) |