|
@@ -45,6 +45,10 @@
|
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
*/
|
|
|
|
|
|
+#ifdef CONFIG_USB_STORAGE_DEBUG
|
|
|
+#define DEBUG
|
|
|
+#endif
|
|
|
+
|
|
|
#include <linux/sched.h>
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/freezer.h>
|
|
@@ -808,14 +812,13 @@ static int usb_stor_scan_thread(void * __us)
|
|
|
{
|
|
|
struct us_data *us = (struct us_data *)__us;
|
|
|
|
|
|
- printk(KERN_DEBUG
|
|
|
- "usb-storage: device found at %d\n", us->pusb_dev->devnum);
|
|
|
+ dev_dbg(&us->pusb_intf->dev, "device found\n");
|
|
|
|
|
|
set_freezable();
|
|
|
/* Wait for the timeout to expire or for a disconnect */
|
|
|
if (delay_use > 0) {
|
|
|
- printk(KERN_DEBUG "usb-storage: waiting for device "
|
|
|
- "to settle before scanning\n");
|
|
|
+ dev_dbg(&us->pusb_intf->dev, "waiting for device to settle "
|
|
|
+ "before scanning\n");
|
|
|
wait_event_freezable_timeout(us->delay_wait,
|
|
|
test_bit(US_FLIDX_DONT_SCAN, &us->dflags),
|
|
|
delay_use * HZ);
|
|
@@ -832,7 +835,7 @@ static int usb_stor_scan_thread(void * __us)
|
|
|
mutex_unlock(&us->dev_mutex);
|
|
|
}
|
|
|
scsi_scan_host(us_to_host(us));
|
|
|
- printk(KERN_DEBUG "usb-storage: device scan complete\n");
|
|
|
+ dev_dbg(&us->pusb_intf->dev, "scan complete\n");
|
|
|
|
|
|
/* Should we unbind if no devices were detected? */
|
|
|
}
|