advansys: Remove call to dma_cache_sync()

Only required if the dma buffer has been allocated via
dma_alloc_noncoherent(), which this one is not.
With that call removed we can now also compile on ARM.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 896bea681a18c5bd3f380e886f9ee12642b2f8ef..dffd57d54aa2da8c1ef7a036395e6741af033572 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -503,7 +503,7 @@ config SCSI_DPT_I2O
 
 config SCSI_ADVANSYS
        tristate "AdvanSys SCSI support"
-       depends on SCSI && VIRT_TO_BUS && !ARM
+       depends on SCSI && VIRT_TO_BUS
        depends on ISA || EISA || PCI
        help
          This is a driver for all SCSI host adapters manufactured by

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 5ece3178195de840edd682d3ae4fa77435770660..e1ce1b70c97389e9371d3ea574d540bb9471f249 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7510,17 +7510,17 @@ static int advansys_slave_configure(struct scsi_device *sdev)
        return 0;
 }
 
-static __le32 advansys_get_sense_buffer_dma(struct scsi_cmnd *scp)
+static __le32 asc_get_sense_buffer_dma(struct scsi_cmnd *scp)
 {
        struct asc_board *board = shost_priv(scp->device->host);
+
        scp->SCp.dma_handle = dma_map_single(board->dev, scp->sense_buffer,
-                                            SCSI_SENSE_BUFFERSIZE, DMA_FROM_DEVICE);
+                                            SCSI_SENSE_BUFFERSIZE,
+                                            DMA_FROM_DEVICE);
        if (dma_mapping_error(board->dev, scp->SCp.dma_handle)) {
                ASC_DBG(1, "failed to map sense buffer\n");
                return 0;
        }
-       dma_cache_sync(board->dev, scp->sense_buffer,
-                      SCSI_SENSE_BUFFERSIZE, DMA_FROM_DEVICE);
        return cpu_to_le32(scp->SCp.dma_handle);
 }
 
@@ -7549,7 +7549,7 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,
        asc_scsi_q->q1.target_lun = scp->device->lun;
        asc_scsi_q->q2.target_ix =
            ASC_TIDLUN_TO_IX(scp->device->id, scp->device->lun);
-       asc_scsi_q->q1.sense_addr = advansys_get_sense_buffer_dma(scp);
+       asc_scsi_q->q1.sense_addr = asc_get_sense_buffer_dma(scp);
        asc_scsi_q->q1.sense_len = SCSI_SENSE_BUFFERSIZE;
        if (!asc_scsi_q->q1.sense_addr)
                return ASC_BUSY;