tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

starfire: clean up dma_addr_t size test

Now we have CONFIG_ARCH_DMA_ADDR_T_64BIT. We can fix the hacky
dma_addr_t size test cleanly.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by FUJITA Tomonori and committed by David S. Miller 1591cb60 5e58e528

+1 -5
unified split
+1 -5
drivers/net/starfire.c
··· 144 /* Time in jiffies before concluding the transmitter is hung. */ 145 #define TX_TIMEOUT (2 * HZ) 146 147 - /* 148 - * This SUCKS. 149 - * We need a much better method to determine if dma_addr_t is 64-bit. 150 - */ 151 - #if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || (defined(CONFIG_MIPS) && ((defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || defined(CONFIG_64BIT))) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)) 152 /* 64-bit dma_addr_t */ 153 #define ADDR_64BITS /* This chip uses 64 bit addresses. */ 154 #define netdrv_addr_t __le64
··· 144 /* Time in jiffies before concluding the transmitter is hung. */ 145 #define TX_TIMEOUT (2 * HZ) 146 147 + #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT 148 /* 64-bit dma_addr_t */ 149 #define ADDR_64BITS /* This chip uses 64 bit addresses. */ 150 #define netdrv_addr_t __le64