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

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  Revert "usb-storage: implement autosuspend"
  USB: disable autosuspend by default for non-hubs
This commit is contained in:
Linus Torvalds 2007-09-13 08:43:38 -07:00
commit 19299b1a72
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/core/quirks.c
View File

@ -152,4 +152,10 @@ void usb_detect_quirks(struct usb_device *udev)
/* do any special quirk handling here if needed */ /* do any special quirk handling here if needed */
if (udev->quirks & USB_QUIRK_NO_AUTOSUSPEND) if (udev->quirks & USB_QUIRK_NO_AUTOSUSPEND)
usb_autosuspend_quirk(udev); usb_autosuspend_quirk(udev);
/* By default, disable autosuspend for all non-hubs */
#ifdef CONFIG_USB_SUSPEND
if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
udev->autosuspend_delay = -1;
#endif
} }

13
drivers/usb/storage/scsiglue.c
View File

@ -285,15 +285,10 @@ static int device_reset(struct scsi_cmnd *srb)
US_DEBUGP("%s called\n", __FUNCTION__); US_DEBUGP("%s called\n", __FUNCTION__);
result = usb_autopm_get_interface(us->pusb_intf); /* lock the device pointers and do the reset */
if (result == 0) { mutex_lock(&(us->dev_mutex));
result = us->transport_reset(us);
/* lock the device pointers and do the reset */ mutex_unlock(&us->dev_mutex);
mutex_lock(&(us->dev_mutex));
result = us->transport_reset(us);
mutex_unlock(&us->dev_mutex);
usb_autopm_put_interface(us->pusb_intf);
}
return result < 0 ? FAILED : SUCCESS; return result < 0 ? FAILED : SUCCESS;
} }

27
drivers/usb/storage/usb.c
View File

@ -184,14 +184,16 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message)
{ {
struct us_data *us = usb_get_intfdata(iface); struct us_data *us = usb_get_intfdata(iface);
US_DEBUGP("%s\n", __FUNCTION__);
/* Wait until no command is running */ /* Wait until no command is running */
mutex_lock(&us->dev_mutex); mutex_lock(&us->dev_mutex);
US_DEBUGP("%s\n", __FUNCTION__);
if (us->suspend_resume_hook) if (us->suspend_resume_hook)
(us->suspend_resume_hook)(us, US_SUSPEND); (us->suspend_resume_hook)(us, US_SUSPEND);
/* When runtime PM is working, we'll set a flag to indicate
* whether we should autoresume when a SCSI request arrives. */
mutex_unlock(&us->dev_mutex); mutex_unlock(&us->dev_mutex);
return 0; return 0;
} }
@ -200,11 +202,13 @@ static int storage_resume(struct usb_interface *iface)
{ {
struct us_data *us = usb_get_intfdata(iface); struct us_data *us = usb_get_intfdata(iface);
US_DEBUGP("%s\n", __FUNCTION__); mutex_lock(&us->dev_mutex);
US_DEBUGP("%s\n", __FUNCTION__);
if (us->suspend_resume_hook) if (us->suspend_resume_hook)
(us->suspend_resume_hook)(us, US_RESUME); (us->suspend_resume_hook)(us, US_RESUME);
mutex_unlock(&us->dev_mutex);
return 0; return 0;
} }
@ -302,7 +306,6 @@ static int usb_stor_control_thread(void * __us)
{ {
struct us_data *us = (struct us_data *)__us; struct us_data *us = (struct us_data *)__us;
struct Scsi_Host *host = us_to_host(us); struct Scsi_Host *host = us_to_host(us);
int autopm_rc;
for(;;) { for(;;) {
US_DEBUGP("*** thread sleeping.\n"); US_DEBUGP("*** thread sleeping.\n");
@ -311,9 +314,6 @@ static int usb_stor_control_thread(void * __us)
US_DEBUGP("*** thread awakened.\n"); US_DEBUGP("*** thread awakened.\n");
/* Autoresume the device */
autopm_rc = usb_autopm_get_interface(us->pusb_intf);
/* lock the device pointers */ /* lock the device pointers */
mutex_lock(&(us->dev_mutex)); mutex_lock(&(us->dev_mutex));
@ -372,12 +372,6 @@ static int usb_stor_control_thread(void * __us)
us->srb->result = SAM_STAT_GOOD; us->srb->result = SAM_STAT_GOOD;
} }
/* Did the autoresume fail? */
else if (autopm_rc < 0) {
US_DEBUGP("Could not wake device\n");
us->srb->result = DID_ERROR << 16;
}
/* we've got a command, let's do it! */ /* we've got a command, let's do it! */
else { else {
US_DEBUG(usb_stor_show_command(us->srb)); US_DEBUG(usb_stor_show_command(us->srb));
@ -420,10 +414,6 @@ SkipForAbort:
/* unlock the device pointers */ /* unlock the device pointers */
mutex_unlock(&us->dev_mutex); mutex_unlock(&us->dev_mutex);
/* Start an autosuspend */
if (autopm_rc == 0)
usb_autopm_put_interface(us->pusb_intf);
} /* for (;;) */ } /* for (;;) */
/* Wait until we are told to stop */ /* Wait until we are told to stop */
@ -941,7 +931,6 @@ retry:
/* Should we unbind if no devices were detected? */ /* Should we unbind if no devices were detected? */
} }
usb_autopm_put_interface(us->pusb_intf);
complete_and_exit(&us->scanning_done, 0); complete_and_exit(&us->scanning_done, 0);
} }
@ -1027,7 +1016,6 @@ static int storage_probe(struct usb_interface *intf,
goto BadDevice; goto BadDevice;
} }
usb_autopm_get_interface(intf); /* dropped in the scanning thread */
wake_up_process(th); wake_up_process(th);
return 0; return 0;
@ -1065,7 +1053,6 @@ static struct usb_driver usb_storage_driver = {
.pre_reset = storage_pre_reset, .pre_reset = storage_pre_reset,
.post_reset = storage_post_reset, .post_reset = storage_post_reset,
.id_table = storage_usb_ids, .id_table = storage_usb_ids,
.supports_autosuspend = 1,
}; };
static int __init usb_stor_init(void) static int __init usb_stor_init(void)