usb: storage: Convert US_DEBUGP to usb_stor_dbg

Use a more current logging style with dev_printk
where possible.

o Convert uses of US_DEBUGP to usb_stor_dbg
o Add "struct us_data *" to usb_stor_dbg uses
o usb_stor_dbg now uses struct device */dev_vprint_emit
o Removed embedded function names
o Coalesce formats
o Remove trailing whitespace
o Remove useless OOM messages
o Remove useless function entry/exit logging
o Convert some US_DEBUGP uses to dev_info and dev_dbg

Object size is slightly reduced when debugging
is enabled, slightly increased with no debugging
because some initialization and removal messages
are now always emitted.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 92f35abee92d..4faa982807f2 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -313,8 +313,6 @@ static int queuecommand_lck(struct scsi_cmnd *srb,
 {
         struct us_data *us = host_to_us(srb->device->host);
 
-        US_DEBUGP("%s called\n", __func__);
-
         /* check for state-transition errors */
         if (us->srb != NULL) {
                 printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n",
@@ -324,7 +322,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb,
 
         /* fail the command if we are disconnecting */
         if (test_bit(US_FLIDX_DISCONNECTING, &us->dflags)) {
-                US_DEBUGP("Fail command during disconnect\n");
+                usb_stor_dbg(us, "Fail command during disconnect\n");
                 srb->result = DID_NO_CONNECT << 16;
                 done(srb);
                 return 0;
@@ -349,7 +347,7 @@ static int command_abort(struct scsi_cmnd *srb)
 {
         struct us_data *us = host_to_us(srb->device->host);
 
-        US_DEBUGP("%s called\n", __func__);
+        usb_stor_dbg(us, "%s called\n", __func__);
 
         /* us->srb together with the TIMED_OUT, RESETTING, and ABORTING
          * bits are protected by the host lock. */
@@ -358,7 +356,7 @@ static int command_abort(struct scsi_cmnd *srb)
         /* Is this command still active? */
         if (us->srb != srb) {
                 scsi_unlock(us_to_host(us));
-                US_DEBUGP ("-- nothing to abort\n");
+                usb_stor_dbg(us, "-- nothing to abort\n");
                 return FAILED;
         }
 
@@ -386,7 +384,7 @@ static int device_reset(struct scsi_cmnd *srb)
         struct us_data *us = host_to_us(srb->device->host);
         int result;
 
-        US_DEBUGP("%s called\n", __func__);
+        usb_stor_dbg(us, "%s called\n", __func__);
 
         /* lock the device pointers and do the reset */
         mutex_lock(&(us->dev_mutex));
@@ -402,7 +400,8 @@ static int bus_reset(struct scsi_cmnd *srb)
         struct us_data *us = host_to_us(srb->device->host);
         int result;
 
-        US_DEBUGP("%s called\n", __func__);
+        usb_stor_dbg(us, "%s called\n", __func__);
+
         result = usb_stor_port_reset(us);
         return result < 0 ? FAILED : SUCCESS;
 }