[SCSI] usb: shuttle_usbat - convert to accessors and !use_sg code path removal

 - functions that received char* but where passed scatterlist* mostly
   were changed to receive void*
 - Use scsi data accessors and remove of !use_sg code path

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Acked-by: Matthew Dharm <mdharm-scsi@one-eyed-alien.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 26 insertions, 42 deletions

diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index cb22a9ad1694..570c1250f6f3 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -130,7 +130,7 @@ static int usbat_write(struct us_data *us,
  * Convenience function to perform a bulk read
  */
 static int usbat_bulk_read(struct us_data *us,
-                           unsigned char *data,
+                           void* buf,
                            unsigned int len,
                            int use_sg)
 {
@@ -138,14 +138,14 @@ static int usbat_bulk_read(struct us_data *us,
                 return USB_STOR_XFER_GOOD;
 
         US_DEBUGP("usbat_bulk_read: len = %d\n", len);
-        return usb_stor_bulk_transfer_sg(us, us->recv_bulk_pipe, data, len, use_sg, NULL);
+        return usb_stor_bulk_transfer_sg(us, us->recv_bulk_pipe, buf, len, use_sg, NULL);
 }
 
 /*
  * Convenience function to perform a bulk write
  */
 static int usbat_bulk_write(struct us_data *us,
-                            unsigned char *data,
+                            void* buf,
                             unsigned int len,
                             int use_sg)
 {
@@ -153,7 +153,7 @@ static int usbat_bulk_write(struct us_data *us,
                 return USB_STOR_XFER_GOOD;
 
         US_DEBUGP("usbat_bulk_write:  len = %d\n", len);
-        return usb_stor_bulk_transfer_sg(us, us->send_bulk_pipe, data, len, use_sg, NULL);
+        return usb_stor_bulk_transfer_sg(us, us->send_bulk_pipe, buf, len, use_sg, NULL);
 }
 
 /*
@@ -314,7 +314,7 @@ static int usbat_wait_not_busy(struct us_data *us, int minutes)
  * Read block data from the data register
  */
 static int usbat_read_block(struct us_data *us,
-                            unsigned char *content,
+                            void* buf,
                             unsigned short len,
                             int use_sg)
 {
@@ -337,7 +337,7 @@ static int usbat_read_block(struct us_data *us,
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
-        result = usbat_bulk_read(us, content, len, use_sg);
+        result = usbat_bulk_read(us, buf, len, use_sg);
         return (result == USB_STOR_XFER_GOOD ?
                         USB_STOR_TRANSPORT_GOOD : USB_STOR_TRANSPORT_ERROR);
 }
@@ -347,7 +347,7 @@ static int usbat_read_block(struct us_data *us,
  */
 static int usbat_write_block(struct us_data *us,
                              unsigned char access,
-                             unsigned char *content,
+                             void* buf,
                              unsigned short len,
                              int minutes,
                              int use_sg)
@@ -372,7 +372,7 @@ static int usbat_write_block(struct us_data *us,
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
-        result = usbat_bulk_write(us, content, len, use_sg);
+        result = usbat_bulk_write(us, buf, len, use_sg);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
@@ -392,7 +392,7 @@ static int usbat_hp8200e_rw_block_test(struct us_data *us,
                                        unsigned char timeout,
                                        unsigned char qualifier,
                                        int direction,
-                                       unsigned char *content,
+                                       void *buf,
                                        unsigned short len,
                                        int use_sg,
                                        int minutes)
@@ -472,7 +472,7 @@ static int usbat_hp8200e_rw_block_test(struct us_data *us,
                 }
 
                 result = usb_stor_bulk_transfer_sg(us,
-                        pipe, content, len, use_sg, NULL);
+                        pipe, buf, len, use_sg, NULL);
 
                 /*
                  * If we get a stall on the bulk download, we'll retry
@@ -606,7 +606,7 @@ static int usbat_multiple_write(struct us_data *us,
  * other related details) are defined beforehand with _set_shuttle_features().
  */
 static int usbat_read_blocks(struct us_data *us,
-                             unsigned char *buffer,
+                             void* buffer,
                              int len,
                              int use_sg)
 {
@@ -648,7 +648,7 @@ static int usbat_read_blocks(struct us_data *us,
  * other related details) are defined beforehand with _set_shuttle_features().
  */
 static int usbat_write_blocks(struct us_data *us,
-                                                          unsigned char *buffer,
+                              void* buffer,
                               int len,
                               int use_sg)
 {
@@ -1170,15 +1170,15 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,
         US_DEBUGP("handle_read10: transfersize %d\n",
                 srb->transfersize);
 
-        if (srb->request_bufflen < 0x10000) {
+        if (scsi_bufflen(srb) < 0x10000) {
 
                 result = usbat_hp8200e_rw_block_test(us, USBAT_ATA, 
                         registers, data, 19,
                         USBAT_ATA_DATA, USBAT_ATA_STATUS, 0xFD,
                         (USBAT_QUAL_FCQ | USBAT_QUAL_ALQ),
                         DMA_FROM_DEVICE,
-                        srb->request_buffer, 
-                        srb->request_bufflen, srb->use_sg, 1);
+                        scsi_sglist(srb),
+                        scsi_bufflen(srb), scsi_sg_count(srb), 1);
 
                 return result;
         }
@@ -1196,7 +1196,7 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,
                 len <<= 16;
                 len |= data[7+7];
                 US_DEBUGP("handle_read10: GPCMD_READ_CD: len %d\n", len);
-                srb->transfersize = srb->request_bufflen/len;
+                srb->transfersize = scsi_bufflen(srb)/len;
         }
 
         if (!srb->transfersize)  {
@@ -1213,7 +1213,7 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,
 
         len = (65535/srb->transfersize) * srb->transfersize;
         US_DEBUGP("Max read is %d bytes\n", len);
-        len = min(len, srb->request_bufflen);
+        len = min(len, scsi_bufflen(srb));
         buffer = kmalloc(len, GFP_NOIO);
         if (buffer == NULL) /* bloody hell! */
                 return USB_STOR_TRANSPORT_FAILED;
@@ -1222,10 +1222,10 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,
         sector |= short_pack(data[7+5], data[7+4]);
         transferred = 0;
 
-        while (transferred != srb->request_bufflen) {
+        while (transferred != scsi_bufflen(srb)) {
 
-                if (len > srb->request_bufflen - transferred)
-                        len = srb->request_bufflen - transferred;
+                if (len > scsi_bufflen(srb) - transferred)
+                        len = scsi_bufflen(srb) - transferred;
 
                 data[3] = len&0xFF;       /* (cylL) = expected length (L) */
                 data[4] = (len>>8)&0xFF;  /* (cylH) = expected length (H) */
@@ -1261,7 +1261,7 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,
                 transferred += len;
                 sector += len / srb->transfersize;
 
-        } /* while transferred != srb->request_bufflen */
+        } /* while transferred != scsi_bufflen(srb) */
 
         kfree(buffer);
         return result;
@@ -1429,9 +1429,8 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
         unsigned char data[32];
         unsigned int len;
         int i;
-        char string[64];
 
-        len = srb->request_bufflen;
+        len = scsi_bufflen(srb);
 
         /* Send A0 (ATA PACKET COMMAND).
            Note: I guess we're never going to get any of the ATA
@@ -1472,8 +1471,8 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
                         USBAT_ATA_DATA, USBAT_ATA_STATUS, 0xFD,
                         (USBAT_QUAL_FCQ | USBAT_QUAL_ALQ),
                         DMA_TO_DEVICE,
-                        srb->request_buffer, 
-                        len, srb->use_sg, 10);
+                        scsi_sglist(srb),
+                        len, scsi_sg_count(srb), 10);
 
                 if (result == USB_STOR_TRANSPORT_GOOD) {
                         transferred += len;
@@ -1540,23 +1539,8 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
                         len = *status;
 
 
-                result = usbat_read_block(us, srb->request_buffer, len, srb->use_sg);
-
-                /* Debug-print the first 32 bytes of the transfer */
-
-                if (!srb->use_sg) {
-                        string[0] = 0;
-                        for (i=0; i<len && i<32; i++) {
-                                sprintf(string+strlen(string), "%02X ",
-                                  ((unsigned char *)srb->request_buffer)[i]);
-                                if ((i%16)==15) {
-                                        US_DEBUGP("%s\n", string);
-                                        string[0] = 0;
-                                }
-                        }
-                        if (string[0]!=0)
-                                US_DEBUGP("%s\n", string);
-                }
+                result = usbat_read_block(us, scsi_sglist(srb), len,
+                                                           scsi_sg_count(srb));
         }
 
         return result;