diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 17:01:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 02:13:10 -0700 |
| commit | 334ae614772b1147435dce9be3911f9040dff0d9 (patch) | |
| tree | a443e687646ab25744b20e43963f728870122e97 /arch/sparc/include/asm/floppy_32.h | |
| parent | 7f06a3b2c162573c924f425053227a52b4bd7cb1 (diff) | |
| download | blackbird-op-linux-334ae614772b1147435dce9be3911f9040dff0d9.tar.gz blackbird-op-linux-334ae614772b1147435dce9be3911f9040dff0d9.zip | |
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.h | 11 |
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) #define EXTRA_FLOPPY_PARAMS +static DEFINE_SPINLOCK(dma_spin_lock); + +#define claim_dma_lock() \ +({ unsigned long flags; \ + spin_lock_irqsave(&dma_spin_lock, flags); \ + flags; \ +}) + +#define release_dma_lock(__flags) \ + spin_unlock_irqrestore(&dma_spin_lock, __flags); + #endif /* !(__ASM_SPARC_FLOPPY_H) */ |
