Skip to content

Commit

Permalink
USB Storage: Make driver less chatty when it finds a new device
Browse files Browse the repository at this point in the history
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: Matthew Wilcox <willy@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Matthew Wilcox authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 00fa43e commit 9eb66f7
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/usb/storage/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand All @@ -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? */
}
Expand Down

0 comments on commit 9eb66f7

Please sign in to comment.