[SCSI] usb: freecom & sddr09 - convert to accessors and !use_sg cleanup

 - Use scsi data accessors and remove of !use_sg code path
 - This patch is dependent on cleanup patch to usb transport.c/h

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>

diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index 88aa59a..f5a4e8d 100644 (file)
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -132,8 +132,7 @@ freecom_readdata (struct scsi_cmnd *srb, struct us_data *us,
 
        /* Now transfer all of our blocks. */
        US_DEBUGP("Start of read\n");
-       result = usb_stor_bulk_transfer_sg(us, ipipe, srb->request_buffer,
-                       count, srb->use_sg, &srb->resid);
+       result = usb_stor_bulk_srb(us, ipipe, srb);
        US_DEBUGP("freecom_readdata done!\n");
 
        if (result > USB_STOR_XFER_SHORT)
@@ -166,8 +165,7 @@ freecom_writedata (struct scsi_cmnd *srb, struct us_data *us,
 
        /* Now transfer all of our blocks. */
        US_DEBUGP("Start of write\n");
-       result = usb_stor_bulk_transfer_sg(us, opipe, srb->request_buffer,
-                       count, srb->use_sg, &srb->resid);
+       result = usb_stor_bulk_srb(us, opipe, srb);
 
        US_DEBUGP("freecom_writedata done!\n");
        if (result > USB_STOR_XFER_SHORT)
@@ -281,7 +279,7 @@ int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
         * and such will hang. */
        US_DEBUGP("Device indicates that it has %d bytes available\n",
                        le16_to_cpu (fst->Count));
-       US_DEBUGP("SCSI requested %d\n", srb->request_bufflen);
+       US_DEBUGP("SCSI requested %d\n", scsi_bufflen(srb));
 
        /* Find the length we desire to read. */
        switch (srb->cmnd[0]) {
@@ -292,12 +290,12 @@ int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
                        length = le16_to_cpu(fst->Count);
                        break;
                default:
-                       length = srb->request_bufflen;
+                       length = scsi_bufflen(srb);
        }
 
        /* verify that this amount is legal */
-       if (length > srb->request_bufflen) {
-               length = srb->request_bufflen;
+       if (length > scsi_bufflen(srb)) {
+               length = scsi_bufflen(srb);
                US_DEBUGP("Truncating request to match buffer length: %d\n", length);
        }
 

diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index b12202c..8972b17 100644 (file)
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -1623,7 +1623,7 @@ int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
                return USB_STOR_TRANSPORT_ERROR;
        }
 
-       if (srb->request_bufflen == 0)
+       if (scsi_bufflen(srb) == 0)
                return USB_STOR_TRANSPORT_GOOD;
 
        if (srb->sc_data_direction == DMA_TO_DEVICE ||
@@ -1634,12 +1634,9 @@ int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
                US_DEBUGP("SDDR09: %s %d bytes\n",
                          (srb->sc_data_direction == DMA_TO_DEVICE) ?
                          "sending" : "receiving",
-                         srb->request_bufflen);
+                         scsi_bufflen(srb));
 
-               result = usb_stor_bulk_transfer_sg(us, pipe,
-                                       srb->request_buffer,
-                                       srb->request_bufflen,
-                                       srb->use_sg, &srb->resid);
+               result = usb_stor_bulk_srb(us, pipe, srb);
 
                return (result == USB_STOR_XFER_GOOD ?
                        USB_STOR_TRANSPORT_GOOD : USB_STOR_TRANSPORT_ERROR);