aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-04-18 20:39:22 -0400
committerGreg K-H <gregkh@suse.de>2005-04-18 20:39:22 -0400
commit27d72e8572336d9f4e17a12ac924cb5223a5758d (patch)
tree791a046b5d860233f652973d0627752b67a3c600 /include/linux
parentc6053ecffb895f6c0e0ec9c1d298e35cffc1f7a6 (diff)
[PATCH] usb suspend updates (interface suspend)
This is the first of a few installments of PM API updates to match the recent switch to "pm_message_t". This installment primarily affects USB device drivers (for USB interfaces), and it changes the handful of drivers which currently implement suspend methods: - <linux/usb.h> and usbcore, signature change - Some drivers only changed the signature, net effect this just shuts up "sparse -Wbitwise": * hid-core * stir4200 - Two network drivers did that, and also grew slightly more featureful suspend code ... they now properly shut down their activities. (As should stir4200...) * pegasus * usbnet Note that the Wake-On-Lan (WOL) support in pegasus doesn't yet work; looks to me like it's missing a request to turn it on, vs just configuring it. The ASIX code in usbnet also has WOL hooks that are ready to use; untested. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Index: gregkh-2.6/drivers/net/irda/stir4200.c ===================================================================
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/usb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index c96728435935..41d1a644c9d4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -558,7 +558,7 @@ struct usb_driver {
558 558
559 int (*ioctl) (struct usb_interface *intf, unsigned int code, void *buf); 559 int (*ioctl) (struct usb_interface *intf, unsigned int code, void *buf);
560 560
561 int (*suspend) (struct usb_interface *intf, u32 state); 561 int (*suspend) (struct usb_interface *intf, pm_message_t message);
562 int (*resume) (struct usb_interface *intf); 562 int (*resume) (struct usb_interface *intf);
563 563
564 const struct usb_device_id *id_table; 564 const struct usb_device_id *id_table;
@@ -977,7 +977,7 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
977 int timeout); 977 int timeout);
978 978
979/* selective suspend/resume */ 979/* selective suspend/resume */
980extern int usb_suspend_device(struct usb_device *dev, u32 state); 980extern int usb_suspend_device(struct usb_device *dev, pm_message_t message);
981extern int usb_resume_device(struct usb_device *dev); 981extern int usb_resume_device(struct usb_device *dev);
982 982
983 983