diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-08-23 16:40:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-25 19:30:51 -0400 |
commit | ad01b7d480a4a135f974afd5c617c417e0b0542f (patch) | |
tree | bd69865fb4bb323e697d46c8b0365ec1774a9696 /drivers/net/stmmac/stmmac.h | |
parent | ac75791aa943c7953521cb4fa7728bf51f9abd2d (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/stmmac.h')
-rw-r--r-- | drivers/net/stmmac/stmmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h index ebebc644b1b8..cca53dbac361 100644 --- a/drivers/net/stmmac/stmmac.h +++ b/drivers/net/stmmac/stmmac.h | |||
@@ -54,6 +54,7 @@ struct stmmac_priv { | |||
54 | unsigned int dma_buf_sz; | 54 | unsigned int dma_buf_sz; |
55 | struct device *device; | 55 | struct device *device; |
56 | struct mac_device_info *hw; | 56 | struct mac_device_info *hw; |
57 | void __iomem *ioaddr; | ||
57 | 58 | ||
58 | struct stmmac_extra_stats xstats; | 59 | struct stmmac_extra_stats xstats; |
59 | struct napi_struct napi; | 60 | struct napi_struct napi; |
@@ -65,7 +66,7 @@ struct stmmac_priv { | |||
65 | int phy_mask; | 66 | int phy_mask; |
66 | int (*phy_reset) (void *priv); | 67 | int (*phy_reset) (void *priv); |
67 | void (*fix_mac_speed) (void *priv, unsigned int speed); | 68 | void (*fix_mac_speed) (void *priv, unsigned int speed); |
68 | void (*bus_setup)(unsigned long ioaddr); | 69 | void (*bus_setup)(void __iomem *ioaddr); |
69 | void *bsp_priv; | 70 | void *bsp_priv; |
70 | 71 | ||
71 | int phy_irq; | 72 | int phy_irq; |