diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-07-25 11:18:00 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-26 15:37:40 +0900 |
| commit | e257ad062a3ceaf36b0e883d0ef00b185daf500e (patch) | |
| tree | bc31371ccb8f387556cb62175d7d1c3069f1e00c /include/asm-sh/floppy.h | |
| parent | 0fbde9509d7b2f71b9326f9c5807a0b4193c7c76 (diff) | |
| download | talos-op-linux-e257ad062a3ceaf36b0e883d0ef00b185daf500e.tar.gz talos-op-linux-e257ad062a3ceaf36b0e883d0ef00b185daf500e.zip | |
sh: Kill off virt_to_bus()/bus_to_virt().
Wire up ARCH_NO_VIRT_TO_BUS, and kill off the remaining users. The
dma-mapping code really wanted virt_to_phys()/phys_to_virt() anyways,
there are no inherently special bus addresses.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh/floppy.h')
| -rw-r--r-- | include/asm-sh/floppy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h index dc1ad464fa32..3b59b3af777b 100644 --- a/include/asm-sh/floppy.h +++ b/include/asm-sh/floppy.h @@ -181,7 +181,7 @@ static void _fd_chose_dma_mode(char *addr, unsigned long size) { if(can_use_virtual_dma == 2) { if((unsigned int) addr >= (unsigned int) high_memory || - virt_to_bus(addr) >= 0x10000000) + virt_to_phys(addr) >= 0x10000000) use_virtual_dma = 1; else use_virtual_dma = 0; @@ -219,7 +219,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) doing_pdma = 0; clear_dma_ff(FLOPPY_DMA); set_dma_mode(FLOPPY_DMA,mode); - set_dma_addr(FLOPPY_DMA,virt_to_bus(addr)); + set_dma_addr(FLOPPY_DMA,virt_to_phys(addr)); set_dma_count(FLOPPY_DMA,size); enable_dma(FLOPPY_DMA); return 0; |
