[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(-)
This commit is contained in:
parent
ccdcf77ae3
commit
5edbfb7c8a
|
@ -1652,10 +1652,10 @@ static int __usb_suspend_device (struct usb_device *udev, int port1)
|
|||
|
||||
#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 port1, struct usb_device *udev)
|
|||
|
||||
#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_device *hdev)
|
|||
kick_khubd(hub);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(usb_suspend_device);
|
||||
EXPORT_SYMBOL(usb_resume_device);
|
||||
|
||||
|
||||
|
||||
/* USB 2.0 spec, 7.1.7.3 / fig 7-29:
|
||||
*
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -975,11 +975,6 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
|
|||
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);
|
||||
|
|
Loading…
Reference in New Issue