diff options
| author |   Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-08-23 20:40:42 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-25 16:30:51 -0700 |
| commit | ad01b7d480a4a135f974afd5c617c417e0b0542f (patch) | |
| tree | bd69865fb4bb323e697d46c8b0365ec1774a9696 /drivers/net/stmmac/stmmac.h | |
| parent | stmmac: remove dead option in the driver's Kconfig (diff) | |
| download | linux-dev-ad01b7d480a4a135f974afd5c617c417e0b0542f.tar.xz linux-dev-ad01b7d480a4a135f974afd5c617c417e0b0542f.zip | |
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 { unsigned int dma_buf_sz; struct device *device; struct mac_device_info *hw; + void __iomem *ioaddr; struct stmmac_extra_stats xstats; struct napi_struct napi; @@ -65,7 +66,7 @@ struct stmmac_priv { int phy_mask; int (*phy_reset) (void *priv); void (*fix_mac_speed) (void *priv, unsigned int speed); - void (*bus_setup)(unsigned long ioaddr); + void (*bus_setup)(void __iomem *ioaddr); void *bsp_priv; int phy_irq; |