Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1591cb60838603c8cc2c540192c8244962436539

Authored by FUJITA Tomonori
Committed by David S. Miller
1 parent 5e58e5283a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 5 deletions Side-by-side Diff

drivers/net/starfire.c
Diff comments   View file @ 1591cb6
... ... @@ -144,11 +144,7 @@
144 144 /* Time in jiffies before concluding the transmitter is hung. */
145 145 #define TX_TIMEOUT (2 * HZ)
146 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))
  147 +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
152 148 /* 64-bit dma_addr_t */
153 149 #define ADDR_64BITS /* This chip uses 64 bit addresses. */
154 150 #define netdrv_addr_t __le64