aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/floppy_32.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 20:01:57 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:13:10 -0400
commit334ae614772b1147435dce9be3911f9040dff0d9 (patch)
treea443e687646ab25744b20e43963f728870122e97 /arch/sparc/include/asm/floppy_32.h
parent7f06a3b2c162573c924f425053227a52b4bd7cb1 (diff)
sparc: Kill SBUS DVMA layer.
This thing was completely pointless. Just find the OF device in the parent of drivers that want to program this device, and map the DMA regs inside such drivers too. This also moves the dummy claim_dma_lock() and release_dma_lock() implementation to floppy_32.h, which makes it handle this issue just like floppy_64.h does. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/floppy_32.h')
-rw-r--r--arch/sparc/include/asm/floppy_32.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h
index ae3f00bf22ff..ff2b91c6eeff 100644
--- a/arch/sparc/include/asm/floppy_32.h
+++ b/arch/sparc/include/asm/floppy_32.h
@@ -385,4 +385,15 @@ static int sparc_eject(void)
385 385
386#define EXTRA_FLOPPY_PARAMS 386#define EXTRA_FLOPPY_PARAMS
387 387
388static DEFINE_SPINLOCK(dma_spin_lock);
389
390#define claim_dma_lock() \
391({ unsigned long flags; \
392 spin_lock_irqsave(&dma_spin_lock, flags); \
393 flags; \
394})
395
396#define release_dma_lock(__flags) \
397 spin_unlock_irqrestore(&dma_spin_lock, __flags);
398
388#endif /* !(__ASM_SPARC_FLOPPY_H) */ 399#endif /* !(__ASM_SPARC_FLOPPY_H) */