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, 3 insertions, 3 deletions

diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index f085ffb606c8..94d16ee5e84b 100644
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -106,7 +106,7 @@ static int rio_karma_send_command(char cmd, struct us_data *us)
         static unsigned char seq = 1;
         struct karma_data *data = (struct karma_data *) us->extra;
 
-        US_DEBUGP("karma: sending command %04x\n", cmd);
+        usb_stor_dbg(us, "sending command %04x\n", cmd);
         memset(us->iobuf, 0, RIO_SEND_LEN);
         memcpy(us->iobuf, RIO_PREFIX, RIO_PREFIX_LEN);
         us->iobuf[5] = cmd;
@@ -139,10 +139,10 @@ static int rio_karma_send_command(char cmd, struct us_data *us)
         if (seq == 0)
                 seq = 1;
 
-        US_DEBUGP("karma: sent command %04x\n", cmd);
+        usb_stor_dbg(us, "sent command %04x\n", cmd);
         return 0;
 err:
-        US_DEBUGP("karma: command %04x failed\n", cmd);
+        usb_stor_dbg(us, "command %04x failed\n", cmd);
         return USB_STOR_TRANSPORT_FAILED;
 }