Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / usb / storage / jumpshot.c

diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index ddc78780b1ad2a687a198281a181a57f5e0417a4..563078be6547844106e9927540d17e556d1971fc 100644 (file)
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -118,7 +118,7 @@ static inline int jumpshot_bulk_read(struct us_data *us,
        if (len == 0)
                return USB_STOR_XFER_GOOD;
 
-       US_DEBUGP("jumpshot_bulk_read:  len = %d\n", len);
+       usb_stor_dbg(us, "len = %d\n", len);
        return usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
                        data, len, NULL);
 }
@@ -131,7 +131,7 @@ static inline int jumpshot_bulk_write(struct us_data *us,
        if (len == 0)
                return USB_STOR_XFER_GOOD;
 
-       US_DEBUGP("jumpshot_bulk_write:  len = %d\n", len);
+       usb_stor_dbg(us, "len = %d\n", len);
        return usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
                        data, len, NULL);
 }
@@ -152,8 +152,7 @@ static int jumpshot_get_status(struct us_data  *us)
                return USB_STOR_TRANSPORT_ERROR;
 
        if (us->iobuf[0] != 0x50) {
-               US_DEBUGP("jumpshot_get_status:  0x%2x\n",
-                         us->iobuf[0]);
+               usb_stor_dbg(us, "0x%2x\n", us->iobuf[0]);
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -218,7 +217,7 @@ static int jumpshot_read_data(struct us_data *us,
                if (result != USB_STOR_XFER_GOOD)
                        goto leave;
 
-               US_DEBUGP("jumpshot_read_data:  %d bytes\n", len);
+               usb_stor_dbg(us, "%d bytes\n", len);
 
                // Store the data in the transfer buffer
                usb_stor_access_xfer_buf(buffer, len, us->srb,
@@ -314,7 +313,7 @@ static int jumpshot_write_data(struct us_data *us,
                } while ((result != USB_STOR_TRANSPORT_GOOD) && (waitcount < 10));
 
                if (result != USB_STOR_TRANSPORT_GOOD)
-                       US_DEBUGP("jumpshot_write_data:  Gah!  Waitcount = 10.  Bad write!?\n");
+                       usb_stor_dbg(us, "Gah!  Waitcount = 10.  Bad write!?\n");
 
                sector += thistime;
                totallen -= len;
@@ -349,8 +348,7 @@ static int jumpshot_id_device(struct us_data *us,
                                   0, 0x20, 0, 6, command, 2);
 
        if (rc != USB_STOR_XFER_GOOD) {
-               US_DEBUGP("jumpshot_id_device:  Gah! "
-                         "send_control for read_capacity failed\n");
+               usb_stor_dbg(us, "Gah! send_control for read_capacity failed\n");
                rc = USB_STOR_TRANSPORT_ERROR;
                goto leave;
        }
@@ -400,17 +398,17 @@ static int jumpshot_handle_mode_sense(struct us_data *us,
 
        switch (pc) {
           case 0x0:
-               US_DEBUGP("jumpshot_handle_mode_sense:  Current values\n");
-               break;
+                  usb_stor_dbg(us, "Current values\n");
+                  break;
           case 0x1:
-               US_DEBUGP("jumpshot_handle_mode_sense:  Changeable values\n");
-               break;
+                  usb_stor_dbg(us, "Changeable values\n");
+                  break;
           case 0x2:
-               US_DEBUGP("jumpshot_handle_mode_sense:  Default values\n");
-               break;
+                  usb_stor_dbg(us, "Default values\n");
+                  break;
           case 0x3:
-               US_DEBUGP("jumpshot_handle_mode_sense:  Saves values\n");
-               break;
+                  usb_stor_dbg(us, "Saves values\n");
+                  break;
        }
 
        memset(ptr, 0, 8);
@@ -494,17 +492,16 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
 
        if (!us->extra) {
                us->extra = kzalloc(sizeof(struct jumpshot_info), GFP_NOIO);
-               if (!us->extra) {
-                       US_DEBUGP("jumpshot_transport:  Gah! Can't allocate storage for jumpshot info struct!\n");
+               if (!us->extra)
                        return USB_STOR_TRANSPORT_ERROR;
-               }
+
                us->extra_destructor = jumpshot_info_destructor;
        }
 
        info = (struct jumpshot_info *) (us->extra);
 
        if (srb->cmnd[0] == INQUIRY) {
-               US_DEBUGP("jumpshot_transport:  INQUIRY.  Returning bogus response.\n");
+               usb_stor_dbg(us, "INQUIRY - Returning bogus response\n");
                memcpy(ptr, inquiry_response, sizeof(inquiry_response));
                fill_inquiry_response(us, ptr, 36);
                return USB_STOR_TRANSPORT_GOOD;
@@ -521,8 +518,8 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
                if (rc != USB_STOR_TRANSPORT_GOOD)
                        return rc;
 
-               US_DEBUGP("jumpshot_transport:  READ_CAPACITY:  %ld sectors, %ld bytes per sector\n",
-                         info->sectors, info->ssize);
+               usb_stor_dbg(us, "READ_CAPACITY:  %ld sectors, %ld bytes per sector\n",
+                            info->sectors, info->ssize);
 
                // build the reply
                //
@@ -534,7 +531,7 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
        }
 
        if (srb->cmnd[0] == MODE_SELECT_10) {
-               US_DEBUGP("jumpshot_transport:  Gah! MODE_SELECT_10.\n");
+               usb_stor_dbg(us, "Gah! MODE_SELECT_10\n");
                return USB_STOR_TRANSPORT_ERROR;
        }
 
@@ -544,7 +541,8 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
 
                blocks = ((u32)(srb->cmnd[7]) << 8) | ((u32)(srb->cmnd[8]));
 
-               US_DEBUGP("jumpshot_transport:  READ_10: read block 0x%04lx  count %ld\n", block, blocks);
+               usb_stor_dbg(us, "READ_10: read block 0x%04lx  count %ld\n",
+                            block, blocks);
                return jumpshot_read_data(us, info, block, blocks);
        }
 
@@ -557,7 +555,8 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
                blocks = ((u32)(srb->cmnd[6]) << 24) | ((u32)(srb->cmnd[7]) << 16) |
                         ((u32)(srb->cmnd[8]) <<  8) | ((u32)(srb->cmnd[9]));
 
-               US_DEBUGP("jumpshot_transport:  READ_12: read block 0x%04lx  count %ld\n", block, blocks);
+               usb_stor_dbg(us, "READ_12: read block 0x%04lx  count %ld\n",
+                            block, blocks);
                return jumpshot_read_data(us, info, block, blocks);
        }
 
@@ -567,7 +566,8 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
 
                blocks = ((u32)(srb->cmnd[7]) << 8) | ((u32)(srb->cmnd[8]));
 
-               US_DEBUGP("jumpshot_transport:  WRITE_10: write block 0x%04lx  count %ld\n", block, blocks);
+               usb_stor_dbg(us, "WRITE_10: write block 0x%04lx  count %ld\n",
+                            block, blocks);
                return jumpshot_write_data(us, info, block, blocks);
        }
 
@@ -580,18 +580,19 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
                blocks = ((u32)(srb->cmnd[6]) << 24) | ((u32)(srb->cmnd[7]) << 16) |
                         ((u32)(srb->cmnd[8]) <<  8) | ((u32)(srb->cmnd[9]));
 
-               US_DEBUGP("jumpshot_transport:  WRITE_12: write block 0x%04lx  count %ld\n", block, blocks);
+               usb_stor_dbg(us, "WRITE_12: write block 0x%04lx  count %ld\n",
+                            block, blocks);
                return jumpshot_write_data(us, info, block, blocks);
        }
 
 
        if (srb->cmnd[0] == TEST_UNIT_READY) {
-               US_DEBUGP("jumpshot_transport:  TEST_UNIT_READY.\n");
+               usb_stor_dbg(us, "TEST_UNIT_READY\n");
                return jumpshot_get_status(us);
        }
 
        if (srb->cmnd[0] == REQUEST_SENSE) {
-               US_DEBUGP("jumpshot_transport:  REQUEST_SENSE.\n");
+               usb_stor_dbg(us, "REQUEST_SENSE\n");
 
                memset(ptr, 0, 18);
                ptr[0] = 0xF0;
@@ -605,12 +606,12 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
        }
 
        if (srb->cmnd[0] == MODE_SENSE) {
-               US_DEBUGP("jumpshot_transport:  MODE_SENSE_6 detected\n");
+               usb_stor_dbg(us, "MODE_SENSE_6 detected\n");
                return jumpshot_handle_mode_sense(us, srb, 1);
        }
 
        if (srb->cmnd[0] == MODE_SENSE_10) {
-               US_DEBUGP("jumpshot_transport:  MODE_SENSE_10 detected\n");
+               usb_stor_dbg(us, "MODE_SENSE_10 detected\n");
                return jumpshot_handle_mode_sense(us, srb, 0);
        }
 
@@ -624,7 +625,7 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
        if (srb->cmnd[0] == START_STOP) {
                /* this is used by sd.c'check_scsidisk_media_change to detect
                   media change */
-               US_DEBUGP("jumpshot_transport:  START_STOP.\n");
+               usb_stor_dbg(us, "START_STOP\n");
                /* the first jumpshot_id_device after a media change returns
                   an error (determined experimentally) */
                rc = jumpshot_id_device(us, info);
@@ -638,8 +639,8 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
                return rc;
        }
 
-       US_DEBUGP("jumpshot_transport:  Gah! Unknown command: %d (0x%x)\n",
-                 srb->cmnd[0], srb->cmnd[0]);
+       usb_stor_dbg(us, "Gah! Unknown command: %d (0x%x)\n",
+                    srb->cmnd[0], srb->cmnd[0]);
        info->sense_key = 0x05;
        info->sense_asc = 0x20;
        info->sense_ascq = 0x00;