- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / drivers / scsi / arm / acornscsi.c

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index eceacf6..3bedf24 100644 (file)
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -1790,7 +1790,7 @@ int acornscsi_starttransfer(AS_Host *host)
        return 0;
     }
 
-    residual = host->SCpnt->request_bufflen - host->scsi.SCp.scsi_xferred;
+    residual = scsi_bufflen(host->SCpnt) - host->scsi.SCp.scsi_xferred;
 
     sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
     sbic_arm_writenext(host->scsi.io_port, residual >> 16);
@@ -2270,7 +2270,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
        case 0x4b:                      /* -> PHASE_STATUSIN                            */
        case 0x8b:                      /* -> PHASE_STATUSIN                            */
            /* DATA IN -> STATUS */
-           host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen -
+           host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) -
                                          acornscsi_sbic_xfcount(host);
            acornscsi_dma_stop(host);
            acornscsi_readstatusbyte(host);
@@ -2281,7 +2281,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
        case 0x4e:                      /* -> PHASE_MSGOUT                              */
        case 0x8e:                      /* -> PHASE_MSGOUT                              */
            /* DATA IN -> MESSAGE OUT */
-           host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen -
+           host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) -
                                          acornscsi_sbic_xfcount(host);
            acornscsi_dma_stop(host);
            acornscsi_sendmessage(host);
@@ -2291,7 +2291,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
        case 0x4f:                      /* message in                                   */
        case 0x8f:                      /* message in                                   */
            /* DATA IN -> MESSAGE IN */
-           host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen -
+           host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) -
                                          acornscsi_sbic_xfcount(host);
            acornscsi_dma_stop(host);
            acornscsi_message(host);    /* -> PHASE_MSGIN, PHASE_DISCONNECT             */
@@ -2319,7 +2319,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
        case 0x4b:                      /* -> PHASE_STATUSIN                            */
        case 0x8b:                      /* -> PHASE_STATUSIN                            */
            /* DATA OUT -> STATUS */
-           host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen -
+           host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) -
                                          acornscsi_sbic_xfcount(host);
            acornscsi_dma_stop(host);
            acornscsi_dma_adjust(host);
@@ -2331,7 +2331,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
        case 0x4e:                      /* -> PHASE_MSGOUT                              */
        case 0x8e:                      /* -> PHASE_MSGOUT                              */
            /* DATA OUT -> MESSAGE OUT */
-           host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen -
+           host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) -
                                          acornscsi_sbic_xfcount(host);
            acornscsi_dma_stop(host);
            acornscsi_dma_adjust(host);
@@ -2342,7 +2342,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
        case 0x4f:                      /* message in                                   */
        case 0x8f:                      /* message in                                   */
            /* DATA OUT -> MESSAGE IN */
-           host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen -
+           host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) -
                                          acornscsi_sbic_xfcount(host);
            acornscsi_dma_stop(host);
            acornscsi_dma_adjust(host);