Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / NCR5380.c

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 3baadd0..a85589a 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -778,7 +778,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)
        }
 
 #ifdef CONFIG_SUN3
-       if ((sun3scsi_dma_finish(rq_data_dir(hostdata->connected->request)))) {
+       if (sun3scsi_dma_finish(hostdata->connected->sc_data_direction)) {
                pr_err("scsi%d: overrun in UDC counter -- not prepared to deal with this!\n",
                       instance->host_no);
                BUG();
@@ -1710,7 +1710,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                count = sun3scsi_dma_xfer_len(hostdata, cmd);
 
                                if (count > 0) {
-                                       if (rq_data_dir(cmd->request))
+                                       if (cmd->sc_data_direction == DMA_TO_DEVICE)
                                                sun3scsi_dma_send_setup(hostdata,
                                                                        cmd->SCp.ptr, count);
                                        else
@@ -2158,7 +2158,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
                count = sun3scsi_dma_xfer_len(hostdata, tmp);
 
                if (count > 0) {
-                       if (rq_data_dir(tmp->request))
+                       if (tmp->sc_data_direction == DMA_TO_DEVICE)
                                sun3scsi_dma_send_setup(hostdata,
                                                        tmp->SCp.ptr, count);
                        else