iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] remove duplicated resume path code

Browse Source 
This gets rid of some inconsistently duplicated logic to resume interfaces.
Similar code was in both finish_port_resume() and in usb_generic_resume().
Now there is just one copy of that code, accessed regardless of whether
CONFIG_USB_SUSPEND is enabled.  Fault handling is also more consistent.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Brownell 2005-09-13 19:57:36 -07:00 committed by Greg Kroah-Hartman
parent 390a8c345e
commit dbc3887e7d
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/usb/core/hub.c
View File

@ -1723,6 +1723,7 @@ static int finish_port_resume(struct usb_device *udev)
status); status);
else if (udev->actconfig) { else if (udev->actconfig) {
unsigned i; unsigned i;
int (*resume)(struct device *);
le16_to_cpus(&devstatus); le16_to_cpus(&devstatus);
if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) { if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
@ -1741,35 +1742,11 @@ static int finish_port_resume(struct usb_device *udev)
} }
/* resume interface drivers; if this is a hub, it /* resume interface drivers; if this is a hub, it
* resumes the child devices * may have a child resume event to deal with soon
*/ */
for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) { resume = udev->dev.bus->resume;
struct usb_interface *intf; for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++)
struct usb_driver *driver; (void) resume(&udev->actconfig->interface[i]->dev);
intf = udev->actconfig->interface[i];
if (is_active(intf))
continue;
if (!intf->dev.driver) {
/* FIXME maybe force to alt 0 */
continue;
}
driver = to_usb_driver(intf->dev.driver);
/* bus_rescan_devices() may rebind drivers */
if (!driver->resume)
continue;
/* can we do better than just logging errors? */
mark_active(intf);
status = driver->resume(intf);
if (status < 0) {
mark_quiesced(intf);
dev_dbg(&intf->dev,
"resume error %d\n",
status);
}
}
status = 0; status = 0;
} else if (udev->devnum <= 0) { } else if (udev->devnum <= 0) {