aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sun_esp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 02:33:42 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:13:31 -0400
commit63237eeb5ac92d618a0a6055f4b1f65c5d14682b (patch)
tree3d44dea70077557a7543951580447dbb71d00b05 /drivers/scsi/sun_esp.c
parent738f2b7b813913e651f39387d007dd961755dee2 (diff)
sparc: Move SBUS DMA attribute interfaces out of asm/sbus.h
This is in preparation for the subsequent asm/sbus.h removal. Also, make these routines take a "struct device" or no arguments, as appropriate. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/sun_esp.c')
-rw-r--r--drivers/scsi/sun_esp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index f7508743f705..ea0c572c7504 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -265,15 +265,17 @@ static void sbus_esp_reset_dma(struct esp *esp)
265{ 265{
266 int can_do_burst16, can_do_burst32, can_do_burst64; 266 int can_do_burst16, can_do_burst32, can_do_burst64;
267 int can_do_sbus64, lim; 267 int can_do_sbus64, lim;
268 struct sbus_dev *sdev;
268 u32 val; 269 u32 val;
269 270
270 can_do_burst16 = (esp->bursts & DMA_BURST16) != 0; 271 can_do_burst16 = (esp->bursts & DMA_BURST16) != 0;
271 can_do_burst32 = (esp->bursts & DMA_BURST32) != 0; 272 can_do_burst32 = (esp->bursts & DMA_BURST32) != 0;
272 can_do_burst64 = 0; 273 can_do_burst64 = 0;
273 can_do_sbus64 = 0; 274 can_do_sbus64 = 0;
274 if (sbus_can_dma_64bit(esp->dev)) 275 sdev = esp->dev;
276 if (sbus_can_dma_64bit())
275 can_do_sbus64 = 1; 277 can_do_sbus64 = 1;
276 if (sbus_can_burst64(esp->sdev)) 278 if (sbus_can_burst64())
277 can_do_burst64 = (esp->bursts & DMA_BURST64) != 0; 279 can_do_burst64 = (esp->bursts & DMA_BURST64) != 0;
278 280
279 /* Put the DVMA into a known state. */ 281 /* Put the DVMA into a known state. */
@@ -300,7 +302,7 @@ static void sbus_esp_reset_dma(struct esp *esp)
300 302
301 if (can_do_sbus64) { 303 if (can_do_sbus64) {
302 esp->prev_hme_dmacsr |= DMA_SCSI_SBUS64; 304 esp->prev_hme_dmacsr |= DMA_SCSI_SBUS64;
303 sbus_set_sbus64(esp->dev, esp->bursts); 305 sbus_set_sbus64(&sdev->ofdev.dev, esp->bursts);
304 } 306 }
305 307
306 lim = 1000; 308 lim = 1000;