Greg:
This patch (as716) splits the core suspend/resume routines up into two
pieces, one for handling devices and one for handling interfaces. This is
a lot cleaner than doing both in one routine.
Alan Stern
Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
---
Index: usb-2.6/drivers/usb/core/driver.c
===================================================================
--- usb-2.6.orig/drivers/usb/core/driver.c
+++ usb-2.6/drivers/usb/core/driver.c
@@ -926,93 +926,138 @@ EXPORT_SYMBOL_GPL_FUTURE(usb_deregister)
#ifdef CONFIG_PM
-static int usb_core_suspend(struct device *dev, pm_message_t msg)
+/* Caller has locked udev */
+static int suspend_device(struct usb_device *udev, pm_message_t msg)
{
- struct usb_driver *driver = to_usb_driver(dev->driver);
- struct usb_device *udev;
- struct usb_interface *intf;
+ struct usb_driver *driver;
int status;
- if (dev->power.power_state.event != PM_EVENT_ON)
+ if (udev->dev.power.power_state.event != PM_EVENT_ON
+ || udev->dev.driver == NULL)
return 0;
- if (dev->driver == NULL)
+ driver = to_usb_driver(udev->dev.driver);
+ status = driver->suspend((struct usb_interface *) udev, msg);
+ return status;
+}
+
+/* Caller has locked udev */
+static int resume_device(struct usb_device *udev)
+{
+ struct usb_driver *driver;
+ int status;
+
+ if (udev->dev.power.power_state.event == PM_EVENT_ON)
return 0;
- if (is_usb_device(dev)) {
- udev = to_usb_device(dev);
+ /* mark things as "on" immediately, no matter what errors crop up */
+ udev->dev.power.power_state.event = PM_EVENT_ON;
- status = driver->suspend((struct usb_interface *) udev, msg);
- return status;
+ if (udev->dev.driver == NULL) {
+ udev->dev.power.power_state.event = PM_EVENT_FREEZE;
+ return 0;
}
- intf = to_usb_interface(dev);
+ if (udev->state == USB_STATE_NOTATTACHED)
+ return 0;
+
+ driver = to_usb_driver(udev->dev.driver);
+ status = driver->resume((struct usb_interface *) udev);
+ return status;
+}
+
+/* Caller has locked intf */
+static int suspend_interface(struct usb_interface *intf, pm_message_t msg)
+{
+ struct usb_driver *driver;
+ int status;
+
+ if (intf->dev.power.power_state.event != PM_EVENT_ON
+ || intf->dev.driver == NULL)
+ return 0;
/* with no hardware, USB interfaces only use FREEZE and ON states */
if (!is_active(intf))
return 0;
+ driver = to_usb_driver(intf->dev.driver);
if (driver->suspend && driver->resume) {
status = driver->suspend(intf, msg);
if (status)
- dev_err(dev, "%s error %d\n", "suspend", status);
+ dev_err(&intf->dev, "%s error %d\n",
+ "suspend", status);
else
mark_quiesced(intf);
} else {
// FIXME else if there's no suspend method, disconnect...
- dev_warn(dev, "no suspend for driver %s?\n", driver->name);
+ dev_warn(&intf->dev, "no suspend for driver %s?\n",
+ driver->name);
mark_quiesced(intf);
status = 0;
}
return status;
}
-static int usb_core_resume(struct device *dev)
+/* Caller has locked intf */
+static int resume_interface(struct usb_interface *intf)
{
- struct usb_driver *driver = to_usb_driver(dev->driver);
- struct usb_interface *intf;
- struct usb_device *udev;
+ struct usb_driver *driver;
int status;
- if (dev->power.power_state.event == PM_EVENT_ON)
+ if (intf->dev.power.power_state.event == PM_EVENT_ON)
return 0;
/* mark things as "on" immediately, no matter what errors crop up */
- dev->power.power_state.event = PM_EVENT_ON;
+ intf->dev.power.power_state.event = PM_EVENT_ON;
- if (dev->driver == NULL) {
- dev->power.power_state.event = PM_EVENT_FREEZE;
+ if (intf->dev.driver == NULL) {
+ intf->dev.power.power_state.event = PM_EVENT_FREEZE;
return 0;
}
- if (is_usb_device(dev)) {
- udev = to_usb_device(dev);
-
- if (udev->state == USB_STATE_NOTATTACHED)
- return 0;
- return driver->resume((struct usb_interface *) udev);
- }
-
- intf = to_usb_interface(dev);
- udev = interface_to_usbdev(intf);
- if (udev->state == USB_STATE_NOTATTACHED)
+ if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED)
return 0;
/* if driver was suspended, it has a resume method;
* however, sysfs can wrongly mark things as suspended
* (on the "no suspend method" FIXME path above)
*/
+ driver = to_usb_driver(intf->dev.driver);
if (driver->resume) {
status = driver->resume(intf);
if (status) {
- dev_err(dev, "%s error %d\n", "resume", status);
+ dev_err(&intf->dev, "%s error %d\n",
+ "resume", status);
mark_quiesced(intf);
}
} else
- dev_warn(dev, "no resume for driver %s?\n", driver->name);
+ dev_warn(&intf->dev, "no resume for driver %s?\n",
+ driver->name);
return 0;
}
+static int usb_core_suspend(struct device *dev, pm_message_t msg)
+{
+ int status;
+
+ if (is_usb_device(dev))
+ status = suspend_device(to_usb_device(dev), msg);
+ else
+ status = suspend_interface(to_usb_interface(dev), msg);
+ return status;
+}
+
+static int usb_core_resume(struct device *dev)
+{
+ int status;
+
+ if (is_usb_device(dev))
+ status = resume_device(to_usb_device(dev));
+ else
+ status = resume_interface(to_usb_interface(dev));
+ return status;
+}
+
#endif /* CONFIG_PM */
struct bus_type usb_bus_type = {
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
