Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] avoid floppy warnings by using fd_dma_setup()
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>
authored by Russell King and committed by Russell King 21d1ca04 1ad2cdbd
+12
-6
include/asm-arm/floppy.h
+12
-6
include/asm-arm/floppy.h
···
30
30
#define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK)
31
31
#define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK)
32
32
33
+
static inline int fd_dma_setup(void *data, unsigned int length,
34
+
unsigned int mode, unsigned long addr)
35
+
{
36
+
set_dma_mode(DMA_FLOPPY, mode);
37
+
__set_dma_addr(DMA_FLOPPY, data);
38
+
set_dma_count(DMA_FLOPPY, length);
39
+
virtual_dma_port = addr;
40
+
enable_dma(DMA_FLOPPY);
41
+
return 0;
42
+
}
43
+
#define fd_dma_setup fd_dma_setup
44
+
33
45
#define fd_request_dma() request_dma(DMA_FLOPPY,"floppy")
34
46
#define fd_free_dma() free_dma(DMA_FLOPPY)
35
47
#define fd_disable_dma() disable_dma(DMA_FLOPPY)
36
-
#define fd_enable_dma() enable_dma(DMA_FLOPPY)
37
-
#define fd_clear_dma_ff() clear_dma_ff(DMA_FLOPPY)
38
-
#define fd_set_dma_mode(mode) set_dma_mode(DMA_FLOPPY, (mode))
39
-
#define fd_set_dma_addr(addr) set_dma_addr(DMA_FLOPPY, virt_to_bus((addr)))
40
-
#define fd_set_dma_count(len) set_dma_count(DMA_FLOPPY, (len))
41
-
#define fd_cacheflush(addr,sz)
42
48
43
49
/* need to clean up dma.h */
44
50
#define DMA_FLOPPYDISK DMA_FLOPPY