]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] avoid floppy warnings by using fd_dma_setup()
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 15 Jul 2007 13:52:16 +0000 (14:52 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Jul 2007 08:39:57 +0000 (09:39 +0100)
Avoid the virt_to_bus()/bus_to_virt() warnings in floppy.c caused
by the (useless) double conversion to/from bus addresses.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
include/asm-arm/floppy.h

index 54b5ae44ed94498151572c7fa1e0a193e1ec20e9..d595c15166a42754944109c8ea47b8b454039142 100644 (file)
 #define fd_disable_irq()       disable_irq(IRQ_FLOPPYDISK)
 #define fd_enable_irq()                enable_irq(IRQ_FLOPPYDISK)
 
+static inline int fd_dma_setup(void *data, unsigned int length,
+                              unsigned int mode, unsigned long addr)
+{
+       set_dma_mode(DMA_FLOPPY, mode);
+       __set_dma_addr(DMA_FLOPPY, data);
+       set_dma_count(DMA_FLOPPY, length);
+       virtual_dma_port = addr;
+       enable_dma(DMA_FLOPPY);
+       return 0;
+}
+#define fd_dma_setup           fd_dma_setup
+
 #define fd_request_dma()       request_dma(DMA_FLOPPY,"floppy")
 #define fd_free_dma()          free_dma(DMA_FLOPPY)
 #define fd_disable_dma()       disable_dma(DMA_FLOPPY)
-#define fd_enable_dma()                enable_dma(DMA_FLOPPY)
-#define fd_clear_dma_ff()      clear_dma_ff(DMA_FLOPPY)
-#define fd_set_dma_mode(mode)  set_dma_mode(DMA_FLOPPY, (mode))
-#define fd_set_dma_addr(addr)  set_dma_addr(DMA_FLOPPY, virt_to_bus((addr)))
-#define fd_set_dma_count(len)  set_dma_count(DMA_FLOPPY, (len))
-#define fd_cacheflush(addr,sz)
 
 /* need to clean up dma.h */
 #define DMA_FLOPPYDISK         DMA_FLOPPY