aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.c
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 /drivers/usb/core/usb.c
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 'drivers/usb/core/usb.c')
-rw-r--r--drivers/usb/core/usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index f0534ee0649..5e45996b5a4 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1382,13 +1382,13 @@ void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe,
1382 usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); 1382 usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
1383} 1383}
1384 1384
1385static int usb_generic_suspend(struct device *dev, u32 state) 1385static int usb_generic_suspend(struct device *dev, pm_message_t message)
1386{ 1386{
1387 struct usb_interface *intf; 1387 struct usb_interface *intf;
1388 struct usb_driver *driver; 1388 struct usb_driver *driver;
1389 1389
1390 if (dev->driver == &usb_generic_driver) 1390 if (dev->driver == &usb_generic_driver)
1391 return usb_suspend_device (to_usb_device(dev), state); 1391 return usb_suspend_device (to_usb_device(dev), message);
1392 1392
1393 if ((dev->driver == NULL) || 1393 if ((dev->driver == NULL) ||
1394 (dev->driver_data == &usb_generic_driver_data)) 1394 (dev->driver_data == &usb_generic_driver_data))
@@ -1402,7 +1402,7 @@ static int usb_generic_suspend(struct device *dev, u32 state)
1402 return 0; 1402 return 0;
1403 1403
1404 if (driver->suspend) 1404 if (driver->suspend)
1405 return driver->suspend(intf, state); 1405 return driver->suspend(intf, message);
1406 return 0; 1406 return 0;
1407} 1407}
1408 1408