diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2006-11-20 11:38:46 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 14:25:53 -0800 |
| commit | 94fcda1f8ab5e0cacc381c5ca1cc9aa6ad523576 (patch) | |
| tree | ffdcc2e33bce1343ce7e57e04e1beca190cf4201 /drivers/usb/core/message.c | |
| parent | ee49fb5dc89d34f1794ac9362fa97c1a640f7ddd (diff) | |
| download | kernel_goldelico_gta04-94fcda1f8ab5e0cacc381c5ca1cc9aa6ad523576.zip kernel_goldelico_gta04-94fcda1f8ab5e0cacc381c5ca1cc9aa6ad523576.tar.gz kernel_goldelico_gta04-94fcda1f8ab5e0cacc381c5ca1cc9aa6ad523576.tar.bz2 | |
usbcore: remove unused argument in autosuspend
Thanks to several earlier patches, usb_autosuspend_device() and
usb_autoresume_device() are never called with a second argument other
than 1. This patch (as819) removes the now-redundant argument.
It also consolidates some common code between those two routines,
putting it into a new subroutine called usb_autopm_do_device(). And
it includes a sizable kerneldoc update for the affected functions.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 5684d87..29b0fa9 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1398,7 +1398,7 @@ free_interfaces: } /* Wake up the device so we can send it the Set-Config request */ - ret = usb_autoresume_device(dev, 1); + ret = usb_autoresume_device(dev); if (ret) goto free_interfaces; @@ -1421,7 +1421,7 @@ free_interfaces: dev->actconfig = cp; if (!cp) { usb_set_device_state(dev, USB_STATE_ADDRESS); - usb_autosuspend_device(dev, 1); + usb_autosuspend_device(dev); goto free_interfaces; } usb_set_device_state(dev, USB_STATE_CONFIGURED); @@ -1490,7 +1490,7 @@ free_interfaces: usb_create_sysfs_intf_files (intf); } - usb_autosuspend_device(dev, 1); + usb_autosuspend_device(dev); return 0; } |