aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-05-30 15:38:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-12 19:34:30 -0400
commitf07600cf9eb3ee92777b2001e564faa413144a99 (patch)
treee48f2e3051fde642e80269bf9c54b289d4abdb44 /drivers/usb/storage
parent624d6c0732d2c4ac00945ad79dbb6ff39ba90ee3 (diff)
USB: add reset_resume method
This patch (as918) introduces a new USB driver method: reset_resume. It is called when a device needs to be reset as part of a resume procedure (whether because of a device quirk or because of the USB-Persist facility), thereby taking over a role formerly assigned to the post_reset method. As a consequence, post_reset no longer needs an argument indicating whether it is being called as part of a reset-resume. This separation of functions makes the code clearer. In addition, the pre_reset and post_reset method return types are changed; they now must return an error code. The return value is unused at present, but at some later time we may unbind drivers and re-probe if they encounter an error during reset handling. The existing pre_reset and post_reset methods in the usbhid, usb-storage, and hub drivers are updated to match the new requirements. For usbhid the post_reset routine is also used for reset_resume (duplicate method pointers); for the other drivers a new reset_resume routine is added. The change to hub.c looks bigger than it really is, because mark_children_for_reset_resume() gets moved down next to the new hub_reset_resume() routine. A minor change to usb-storage makes the usb_stor_report_bus_reset() routine acquire the host lock instead of requiring the caller to hold it already. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Jiri Kosina <jkosina@suse.cz> CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/scsiglue.c8
-rw-r--r--drivers/usb/storage/usb.c28
2 files changed, 26 insertions, 10 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index e227f64d5641..1ba19eaa1970 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -321,10 +321,14 @@ void usb_stor_report_device_reset(struct us_data *us)
321 321
322/* Report a driver-initiated bus reset to the SCSI layer. 322/* Report a driver-initiated bus reset to the SCSI layer.
323 * Calling this for a SCSI-initiated reset is unnecessary but harmless. 323 * Calling this for a SCSI-initiated reset is unnecessary but harmless.
324 * The caller must own the SCSI host lock. */ 324 * The caller must not own the SCSI host lock. */
325void usb_stor_report_bus_reset(struct us_data *us) 325void usb_stor_report_bus_reset(struct us_data *us)
326{ 326{
327 scsi_report_bus_reset(us_to_host(us), 0); 327 struct Scsi_Host *host = us_to_host(us);
328
329 scsi_lock(host);
330 scsi_report_bus_reset(host, 0);
331 scsi_unlock(host);
328} 332}
329 333
330/*********************************************************************** 334/***********************************************************************
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index be4cd8fe4ce6..00521f1d6a6b 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -219,6 +219,20 @@ static int storage_resume(struct usb_interface *iface)
219 return 0; 219 return 0;
220} 220}
221 221
222static int storage_reset_resume(struct usb_interface *iface)
223{
224 struct us_data *us = usb_get_intfdata(iface);
225
226 US_DEBUGP("%s\n", __FUNCTION__);
227
228 /* Report the reset to the SCSI core */
229 usb_stor_report_bus_reset(us);
230
231 /* FIXME: Notify the subdrivers that they need to reinitialize
232 * the device */
233 return 0;
234}
235
222#endif /* CONFIG_PM */ 236#endif /* CONFIG_PM */
223 237
224/* 238/*
@@ -226,7 +240,7 @@ static int storage_resume(struct usb_interface *iface)
226 * a USB port reset, whether from this driver or a different one. 240 * a USB port reset, whether from this driver or a different one.
227 */ 241 */
228 242
229static void storage_pre_reset(struct usb_interface *iface) 243static int storage_pre_reset(struct usb_interface *iface)
230{ 244{
231 struct us_data *us = usb_get_intfdata(iface); 245 struct us_data *us = usb_get_intfdata(iface);
232 246
@@ -234,26 +248,23 @@ static void storage_pre_reset(struct usb_interface *iface)
234 248
235 /* Make sure no command runs during the reset */ 249 /* Make sure no command runs during the reset */
236 mutex_lock(&us->dev_mutex); 250 mutex_lock(&us->dev_mutex);
251 return 0;
237} 252}
238 253
239static void storage_post_reset(struct usb_interface *iface, int reset_resume) 254static int storage_post_reset(struct usb_interface *iface)
240{ 255{
241 struct us_data *us = usb_get_intfdata(iface); 256 struct us_data *us = usb_get_intfdata(iface);
242 257
243 US_DEBUGP("%s\n", __FUNCTION__); 258 US_DEBUGP("%s\n", __FUNCTION__);
244 259
245 /* Report the reset to the SCSI core */ 260 /* Report the reset to the SCSI core */
246 scsi_lock(us_to_host(us));
247 usb_stor_report_bus_reset(us); 261 usb_stor_report_bus_reset(us);
248 scsi_unlock(us_to_host(us));
249 262
250 /* FIXME: Notify the subdrivers that they need to reinitialize 263 /* FIXME: Notify the subdrivers that they need to reinitialize
251 * the device */ 264 * the device */
252 265
253 /* If this is a reset-resume then the pre_reset routine wasn't 266 mutex_unlock(&us->dev_mutex);
254 * called, so we don't need to unlock the mutex. */ 267 return 0;
255 if (!reset_resume)
256 mutex_unlock(&us->dev_mutex);
257} 268}
258 269
259/* 270/*
@@ -1061,6 +1072,7 @@ static struct usb_driver usb_storage_driver = {
1061#ifdef CONFIG_PM 1072#ifdef CONFIG_PM
1062 .suspend = storage_suspend, 1073 .suspend = storage_suspend,
1063 .resume = storage_resume, 1074 .resume = storage_resume,
1075 .reset_resume = storage_reset_resume,
1064#endif 1076#endif
1065 .pre_reset = storage_pre_reset, 1077 .pre_reset = storage_pre_reset,
1066 .post_reset = storage_post_reset, 1078 .post_reset = storage_post_reset,