diff options
Diffstat (limited to 'drivers/net/stmmac/dwmac100_dma.c')
-rw-r--r-- | drivers/net/stmmac/dwmac100_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/stmmac/dwmac100_dma.c b/drivers/net/stmmac/dwmac100_dma.c index 2fece7b72727..c7279d2b946b 100644 --- a/drivers/net/stmmac/dwmac100_dma.c +++ b/drivers/net/stmmac/dwmac100_dma.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "dwmac100.h" | 31 | #include "dwmac100.h" |
32 | #include "dwmac_dma.h" | 32 | #include "dwmac_dma.h" |
33 | 33 | ||
34 | static int dwmac100_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx, | 34 | static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx, |
35 | u32 dma_rx) | 35 | u32 dma_rx) |
36 | { | 36 | { |
37 | u32 value = readl(ioaddr + DMA_BUS_MODE); | 37 | u32 value = readl(ioaddr + DMA_BUS_MODE); |
@@ -58,7 +58,7 @@ static int dwmac100_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx, | |||
58 | /* Store and Forward capability is not used at all.. | 58 | /* Store and Forward capability is not used at all.. |
59 | * The transmit threshold can be programmed by | 59 | * The transmit threshold can be programmed by |
60 | * setting the TTC bits in the DMA control register.*/ | 60 | * setting the TTC bits in the DMA control register.*/ |
61 | static void dwmac100_dma_operation_mode(unsigned long ioaddr, int txmode, | 61 | static void dwmac100_dma_operation_mode(void __iomem *ioaddr, int txmode, |
62 | int rxmode) | 62 | int rxmode) |
63 | { | 63 | { |
64 | u32 csr6 = readl(ioaddr + DMA_CONTROL); | 64 | u32 csr6 = readl(ioaddr + DMA_CONTROL); |
@@ -73,7 +73,7 @@ static void dwmac100_dma_operation_mode(unsigned long ioaddr, int txmode, | |||
73 | writel(csr6, ioaddr + DMA_CONTROL); | 73 | writel(csr6, ioaddr + DMA_CONTROL); |
74 | } | 74 | } |
75 | 75 | ||
76 | static void dwmac100_dump_dma_regs(unsigned long ioaddr) | 76 | static void dwmac100_dump_dma_regs(void __iomem *ioaddr) |
77 | { | 77 | { |
78 | int i; | 78 | int i; |
79 | 79 | ||
@@ -91,7 +91,7 @@ static void dwmac100_dump_dma_regs(unsigned long ioaddr) | |||
91 | /* DMA controller has two counters to track the number of | 91 | /* DMA controller has two counters to track the number of |
92 | * the receive missed frames. */ | 92 | * the receive missed frames. */ |
93 | static void dwmac100_dma_diagnostic_fr(void *data, struct stmmac_extra_stats *x, | 93 | static void dwmac100_dma_diagnostic_fr(void *data, struct stmmac_extra_stats *x, |
94 | unsigned long ioaddr) | 94 | void __iomem *ioaddr) |
95 | { | 95 | { |
96 | struct net_device_stats *stats = (struct net_device_stats *)data; | 96 | struct net_device_stats *stats = (struct net_device_stats *)data; |
97 | u32 csr8 = readl(ioaddr + DMA_MISSED_FRAME_CTR); | 97 | u32 csr8 = readl(ioaddr + DMA_MISSED_FRAME_CTR); |