aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac/dwmac1000_dma.c
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2010-08-23 16:40:42 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-25 19:30:51 -0400
commitad01b7d480a4a135f974afd5c617c417e0b0542f (patch)
treebd69865fb4bb323e697d46c8b0365ec1774a9696 /drivers/net/stmmac/dwmac1000_dma.c
parentac75791aa943c7953521cb4fa7728bf51f9abd2d (diff)
stmmac: make ioaddr 'void __iomem *' rather than unsigned long
This avoids unnecessary casting and adds the ioaddr in the private structure. This patch also removes many warning when compile the driver. Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac/dwmac1000_dma.c')
-rw-r--r--drivers/net/stmmac/dwmac1000_dma.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/stmmac/dwmac1000_dma.c b/drivers/net/stmmac/dwmac1000_dma.c
index 415805057cb0..2ef5a56370e9 100644
--- a/drivers/net/stmmac/dwmac1000_dma.c
+++ b/drivers/net/stmmac/dwmac1000_dma.c
@@ -29,7 +29,7 @@
29#include "dwmac1000.h" 29#include "dwmac1000.h"
30#include "dwmac_dma.h" 30#include "dwmac_dma.h"
31 31
32static int dwmac1000_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx, 32static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,
33 u32 dma_rx) 33 u32 dma_rx)
34{ 34{
35 u32 value = readl(ioaddr + DMA_BUS_MODE); 35 u32 value = readl(ioaddr + DMA_BUS_MODE);
@@ -58,7 +58,7 @@ static int dwmac1000_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx,
58 return 0; 58 return 0;
59} 59}
60 60
61static void dwmac1000_dma_operation_mode(unsigned long ioaddr, int txmode, 61static void dwmac1000_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);
@@ -111,12 +111,12 @@ static void dwmac1000_dma_operation_mode(unsigned long ioaddr, int txmode,
111 111
112/* Not yet implemented --- no RMON module */ 112/* Not yet implemented --- no RMON module */
113static void dwmac1000_dma_diagnostic_fr(void *data, 113static void dwmac1000_dma_diagnostic_fr(void *data,
114 struct stmmac_extra_stats *x, unsigned long ioaddr) 114 struct stmmac_extra_stats *x, void __iomem *ioaddr)
115{ 115{
116 return; 116 return;
117} 117}
118 118
119static void dwmac1000_dump_dma_regs(unsigned long ioaddr) 119static void dwmac1000_dump_dma_regs(void __iomem *ioaddr)
120{ 120{
121 int i; 121 int i;
122 pr_info(" DMA registers\n"); 122 pr_info(" DMA registers\n");