From 140d8f687457c40a66af362838fac0d7893e7df5 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Sat, 1 Jul 2006 22:07:21 -0400 Subject: usbcore: rename usb_suspend_device to usb_port_suspend This revised patch (as715b) renames usb_suspend_device to usb_port_suspend, usb_resume_device to usb_port_resume, and finish_device_resume to finish_port_resume. There was no objection to the original version of the patch so this should be okay to apply. The revision was needed only because I have re-arranged the order of the earlier patches. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/usb.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/usb/core/usb.c') diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index ab766e0fe4ef..b28a31b20308 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1014,7 +1014,7 @@ static int usb_generic_suspend(struct device *dev, pm_message_t message) status = device_for_each_child(dev, NULL, verify_suspended); if (status) return status; - return usb_suspend_device (to_usb_device(dev)); + return usb_port_suspend(to_usb_device(dev)); } if ((dev->driver == NULL) || @@ -1061,7 +1061,7 @@ static int usb_generic_resume(struct device *dev) udev = to_usb_device(dev); if (udev->state == USB_STATE_NOTATTACHED) return 0; - return usb_resume_device (to_usb_device(dev)); + return usb_port_resume(udev); } if ((dev->driver == NULL) || @@ -1209,9 +1209,6 @@ EXPORT_SYMBOL(usb_find_interface); EXPORT_SYMBOL(usb_ifnum_to_if); EXPORT_SYMBOL(usb_altnum_to_altsetting); -EXPORT_SYMBOL(usb_reset_device); -EXPORT_SYMBOL(usb_reset_composite_device); - EXPORT_SYMBOL(__usb_get_extra_descriptor); EXPORT_SYMBOL(usb_find_device); -- cgit v1.2.3