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, 40 insertions, 46 deletions

diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index d278c5a99b7a..aacedef9667c 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -145,8 +145,7 @@ static int sddr55_status(struct us_data *us)
         result = sddr55_bulk_transport(us,
                 DMA_TO_DEVICE, command, 8);
 
-        US_DEBUGP("Result for send_command in status %d\n",
-                result);
+        usb_stor_dbg(us, "Result for send_command in status %d\n", result);
 
         if (result != USB_STOR_XFER_GOOD) {
                 set_sense_info (4, 0, 0);       /* hardware error */
@@ -236,9 +235,8 @@ static int sddr55_read_data(struct us_data *us,
                                 info->blocksize - page);
                 len = pages << info->pageshift;
 
-                US_DEBUGP("Read %02X pages, from PBA %04X"
-                        " (LBA %04X) page %02X\n",
-                        pages, pba, lba, page);
+                usb_stor_dbg(us, "Read %02X pages, from PBA %04X (LBA %04X) page %02X\n",
+                             pages, pba, lba, page);
 
                 if (pba == NOT_ALLOCATED) {
                         /* no pba for this lba, fill with zeroes */
@@ -261,8 +259,8 @@ static int sddr55_read_data(struct us_data *us,
                         result = sddr55_bulk_transport(us,
                                 DMA_TO_DEVICE, command, 8);
 
-                        US_DEBUGP("Result for send_command in read_data %d\n",
-                                result);
+                        usb_stor_dbg(us, "Result for send_command in read_data %d\n",
+                                     result);
 
                         if (result != USB_STOR_XFER_GOOD) {
                                 result = USB_STOR_TRANSPORT_ERROR;
@@ -368,9 +366,8 @@ static int sddr55_write_data(struct us_data *us,
                 usb_stor_access_xfer_buf(buffer, len, us->srb,
                                 &sg, &offset, FROM_XFER_BUF);
 
-                US_DEBUGP("Write %02X pages, to PBA %04X"
-                        " (LBA %04X) page %02X\n",
-                        pages, pba, lba, page);
+                usb_stor_dbg(us, "Write %02X pages, to PBA %04X (LBA %04X) page %02X\n",
+                             pages, pba, lba, page);
                         
                 command[4] = 0;
 
@@ -384,7 +381,7 @@ static int sddr55_write_data(struct us_data *us,
                         /* set pba to first block in zone lba is in */
                         pba = (lba / 1000) * 1024;
 
-                        US_DEBUGP("No PBA for LBA %04X\n",lba);
+                        usb_stor_dbg(us, "No PBA for LBA %04X\n", lba);
 
                         if (max_pba > 1024)
                                 max_pba = 1024;
@@ -407,14 +404,15 @@ static int sddr55_write_data(struct us_data *us,
 
                         if (pba == -1) {
                                 /* oh dear */
-                                US_DEBUGP("Couldn't find unallocated block\n");
+                                usb_stor_dbg(us, "Couldn't find unallocated block\n");
 
                                 set_sense_info (3, 0x31, 0);    /* medium error */
                                 result = USB_STOR_TRANSPORT_FAILED;
                                 goto leave;
                         }
 
-                        US_DEBUGP("Allocating PBA %04X for LBA %04X\n", pba, lba);
+                        usb_stor_dbg(us, "Allocating PBA %04X for LBA %04X\n",
+                                     pba, lba);
 
                         /* set writing to unallocated block flag */
                         command[4] = 0x40;
@@ -439,8 +437,8 @@ static int sddr55_write_data(struct us_data *us,
                         DMA_TO_DEVICE, command, 8);
 
                 if (result != USB_STOR_XFER_GOOD) {
-                        US_DEBUGP("Result for send_command in write_data %d\n",
-                        result);
+                        usb_stor_dbg(us, "Result for send_command in write_data %d\n",
+                                     result);
 
                         /* set_sense_info is superfluous here? */
                         set_sense_info (3, 0x3, 0);/* peripheral write error */
@@ -453,8 +451,8 @@ static int sddr55_write_data(struct us_data *us,
                         DMA_TO_DEVICE, buffer, len);
 
                 if (result != USB_STOR_XFER_GOOD) {
-                        US_DEBUGP("Result for send_data in write_data %d\n",
-                                  result);
+                        usb_stor_dbg(us, "Result for send_data in write_data %d\n",
+                                     result);
 
                         /* set_sense_info is superfluous here? */
                         set_sense_info (3, 0x3, 0);/* peripheral write error */
@@ -466,8 +464,8 @@ static int sddr55_write_data(struct us_data *us,
                 result = sddr55_bulk_transport(us, DMA_FROM_DEVICE, status, 6);
 
                 if (result != USB_STOR_XFER_GOOD) {
-                        US_DEBUGP("Result for get_status in write_data %d\n",
-                                  result);
+                        usb_stor_dbg(us, "Result for get_status in write_data %d\n",
+                                     result);
 
                         /* set_sense_info is superfluous here? */
                         set_sense_info (3, 0x3, 0);/* peripheral write error */
@@ -487,8 +485,8 @@ static int sddr55_write_data(struct us_data *us,
                         goto leave;
                 }
 
-                US_DEBUGP("Updating maps for LBA %04X: old PBA %04X, new PBA %04X\n",
-                        lba, pba, new_pba);
+                usb_stor_dbg(us, "Updating maps for LBA %04X: old PBA %04X, new PBA %04X\n",
+                             lba, pba, new_pba);
 
                 /* update the lba<->pba maps, note new_pba might be the same as pba */
                 info->lba_to_pba[lba] = new_pba;
@@ -531,8 +529,8 @@ static int sddr55_read_deviceID(struct us_data *us,
         command[7] = 0x84;
         result = sddr55_bulk_transport(us, DMA_TO_DEVICE, command, 8);
 
-        US_DEBUGP("Result of send_control for device ID is %d\n",
-                result);
+        usb_stor_dbg(us, "Result of send_control for device ID is %d\n",
+                     result);
 
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
@@ -568,20 +566,19 @@ static unsigned long sddr55_get_capacity(struct us_data *us) {
         int result;
         struct sddr55_card_info *info = (struct sddr55_card_info *)us->extra;
 
-        US_DEBUGP("Reading capacity...\n");
+        usb_stor_dbg(us, "Reading capacity...\n");
 
         result = sddr55_read_deviceID(us,
                 &manufacturerID,
                 &deviceID);
 
-        US_DEBUGP("Result of read_deviceID is %d\n",
-                result);
+        usb_stor_dbg(us, "Result of read_deviceID is %d\n", result);
 
         if (result != USB_STOR_XFER_GOOD)
                 return 0;
 
-        US_DEBUGP("Device ID = %02X\n", deviceID);
-        US_DEBUGP("Manuf  ID = %02X\n", manufacturerID);
+        usb_stor_dbg(us, "Device ID = %02X\n", deviceID);
+        usb_stor_dbg(us, "Manuf  ID = %02X\n", manufacturerID);
 
         info->pageshift = 9;
         info->smallpageshift = 0;
@@ -753,7 +750,7 @@ static int sddr55_read_map(struct us_data *us) {
                 }
 
                 if (lba<0x10 || (lba>=0x3E0 && lba<0x3EF))
-                        US_DEBUGP("LBA %04X <-> PBA %04X\n", lba, i);
+                        usb_stor_dbg(us, "LBA %04X <-> PBA %04X\n", lba, i);
 
                 info->lba_to_pba[lba + zone * 1000] = i;
         }
@@ -808,7 +805,10 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
         info = (struct sddr55_card_info *)(us->extra);
 
         if (srb->cmnd[0] == REQUEST_SENSE) {
-                US_DEBUGP("SDDR55: request sense %02x/%02x/%02x\n", info->sense_data[2], info->sense_data[12], info->sense_data[13]);
+                usb_stor_dbg(us, "request sense %02x/%02x/%02x\n",
+                             info->sense_data[2],
+                             info->sense_data[12],
+                             info->sense_data[13]);
 
                 memcpy (ptr, info->sense_data, sizeof info->sense_data);
                 ptr[0] = 0x70;
@@ -892,13 +892,11 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
                 usb_stor_set_xfer_buf(ptr, sizeof(mode_page_01), srb);
 
                 if ( (srb->cmnd[2] & 0x3F) == 0x01 ) {
-                        US_DEBUGP(
-                          "SDDR55: Dummy up request for mode page 1\n");
+                        usb_stor_dbg(us, "Dummy up request for mode page 1\n");
                         return USB_STOR_TRANSPORT_GOOD;
 
                 } else if ( (srb->cmnd[2] & 0x3F) == 0x3F ) {
-                        US_DEBUGP(
-                          "SDDR55: Dummy up request for all mode pages\n");
+                        usb_stor_dbg(us, "Dummy up request for all mode pages\n");
                         return USB_STOR_TRANSPORT_GOOD;
                 }
 
@@ -908,10 +906,8 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
 
         if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL) {
 
-                US_DEBUGP(
-                  "SDDR55: %s medium removal. Not that I can do"
-                  " anything about it...\n",
-                  (srb->cmnd[4]&0x03) ? "Prevent" : "Allow");
+                usb_stor_dbg(us, "%s medium removal. Not that I can do anything about it...\n",
+                             (srb->cmnd[4]&0x03) ? "Prevent" : "Allow");
 
                 return USB_STOR_TRANSPORT_GOOD;
 
@@ -935,8 +931,8 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
 
                 if (lba >= info->max_log_blks) {
 
-                        US_DEBUGP("Error: Requested LBA %04X exceeds maximum "
-                          "block %04X\n", lba, info->max_log_blks-1);
+                        usb_stor_dbg(us, "Error: Requested LBA %04X exceeds maximum block %04X\n",
+                                     lba, info->max_log_blks - 1);
 
                         set_sense_info (5, 0x24, 0);    /* invalid field in command */
 
@@ -946,15 +942,13 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
                 pba = info->lba_to_pba[lba];
 
                 if (srb->cmnd[0] == WRITE_10) {
-                        US_DEBUGP("WRITE_10: write block %04X (LBA %04X) page %01X"
-                                " pages %d\n",
-                                pba, lba, page, pages);
+                        usb_stor_dbg(us, "WRITE_10: write block %04X (LBA %04X) page %01X pages %d\n",
+                                     pba, lba, page, pages);
 
                         return sddr55_write_data(us, lba, page, pages);
                 } else {
-                        US_DEBUGP("READ_10: read block %04X (LBA %04X) page %01X"
-                                " pages %d\n",
-                                pba, lba, page, pages);
+                        usb_stor_dbg(us, "READ_10: read block %04X (LBA %04X) page %01X pages %d\n",
+                                     pba, lba, page, pages);
 
                         return sddr55_read_data(us, lba, page, pages);
                 }