We don't really want to export these any more, especially now that the HCDs don't need them.
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 <[EMAIL PROTECTED]> --- g26.orig/drivers/usb/core/usb.h 2005-09-22 22:15:14.000000000 -0700 +++ g26/drivers/usb/core/usb.h 2005-09-22 22:15:23.000000000 -0700 @@ -29,6 +29,10 @@ extern void usb_major_cleanup(void); extern int usb_host_init(void); extern void usb_host_cleanup(void); +extern int usb_suspend_device(struct usb_device *dev); +extern int usb_resume_device(struct usb_device *dev); + + /* Interfaces and their "power state" are owned by usbcore */ static inline void mark_active(struct usb_interface *f) --- g26.orig/include/linux/usb.h 2005-09-22 22:14:41.000000000 -0700 +++ g26/include/linux/usb.h 2005-09-22 22:15:23.000000000 -0700 @@ -974,11 +974,6 @@ extern int usb_bulk_msg(struct usb_devic void *data, int len, int *actual_length, int timeout); -/* selective suspend/resume */ -extern int usb_suspend_device(struct usb_device *dev); -extern int usb_resume_device(struct usb_device *dev); - - /* wrappers around usb_control_msg() for the most common standard requests */ extern int usb_get_descriptor(struct usb_device *dev, unsigned char desctype, unsigned char descindex, void *buf, int size); --- g26.orig/drivers/usb/core/hub.c 2005-09-22 22:15:15.000000000 -0700 +++ g26/drivers/usb/core/hub.c 2005-09-22 22:15:23.000000000 -0700 @@ -1652,10 +1652,10 @@ static int __usb_suspend_device (struct #endif -/** +/* * usb_suspend_device - suspend a usb device * @udev: device that's no longer in active use - * Context: must be able to sleep; device not locked + * Context: must be able to sleep; device not locked; pm locks held * * Suspends a USB device that isn't in active use, conserving power. * Devices may wake out of a suspend, if anything important happens, @@ -1820,10 +1820,10 @@ hub_port_resume(struct usb_hub *hub, int #endif -/** +/* * usb_resume_device - re-activate a suspended usb device * @udev: device to re-activate - * Context: must be able to sleep; device not locked + * Context: must be able to sleep; device not locked; pm locks held * * This will re-activate the suspended device, increasing power usage * while letting drivers communicate again with its endpoints. @@ -2024,10 +2024,6 @@ void usb_resume_root_hub(struct usb_devi kick_khubd(hub); } -EXPORT_SYMBOL(usb_suspend_device); -EXPORT_SYMBOL(usb_resume_device); - - /* USB 2.0 spec, 7.1.7.3 / fig 7-29: *
