Commit 9eb66f71 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Greg Kroah-Hartman

USB Storage: Make driver less chatty when it finds a new device

Use dev_dbg() instead of an unconditional printk(KERN_DEBUG).  This has
two benefits; one is that it identifies the USB device which the messages
related to, and the other is that the messages won't be produced unless
debug is turned on.

Enable the debug messages when CONFIG_USB_STORAGE_DEBUG is set.
Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 00fa43ef
...@@ -45,6 +45,10 @@ ...@@ -45,6 +45,10 @@
* 675 Mass Ave, Cambridge, MA 02139, USA. * 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifdef CONFIG_USB_STORAGE_DEBUG
#define DEBUG
#endif
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/freezer.h> #include <linux/freezer.h>
...@@ -808,14 +812,13 @@ static int usb_stor_scan_thread(void * __us) ...@@ -808,14 +812,13 @@ static int usb_stor_scan_thread(void * __us)
{ {
struct us_data *us = (struct us_data *)__us; struct us_data *us = (struct us_data *)__us;
printk(KERN_DEBUG dev_dbg(&us->pusb_intf->dev, "device found\n");
"usb-storage: device found at %d\n", us->pusb_dev->devnum);
set_freezable(); set_freezable();
/* Wait for the timeout to expire or for a disconnect */ /* Wait for the timeout to expire or for a disconnect */
if (delay_use > 0) { if (delay_use > 0) {
printk(KERN_DEBUG "usb-storage: waiting for device " dev_dbg(&us->pusb_intf->dev, "waiting for device to settle "
"to settle before scanning\n"); "before scanning\n");
wait_event_freezable_timeout(us->delay_wait, wait_event_freezable_timeout(us->delay_wait,
test_bit(US_FLIDX_DONT_SCAN, &us->dflags), test_bit(US_FLIDX_DONT_SCAN, &us->dflags),
delay_use * HZ); delay_use * HZ);
...@@ -832,7 +835,7 @@ static int usb_stor_scan_thread(void * __us) ...@@ -832,7 +835,7 @@ static int usb_stor_scan_thread(void * __us)
mutex_unlock(&us->dev_mutex); mutex_unlock(&us->dev_mutex);
} }
scsi_scan_host(us_to_host(us)); 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? */ /* Should we unbind if no devices were detected? */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment