diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-11-23 21:37:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-24 14:14:24 -0500 |
commit | 9dfeb4d953f914bd3bb56ce60e22ee84687399ce (patch) | |
tree | 37d9d33974944cb219e911e0aa965d337fee2ed7 /drivers/net/stmmac/stmmac_ethtool.c | |
parent | b340007f79941297c44a7dfba4d3c587ff81590f (diff) |
stmmac: tidy-up stmmac_priv structure
This patch tidies-up the stmmac_priv structure
that had many fileds alredy defined in the
plat_stmmacenet_data structure.
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_ethtool.c')
-rw-r--r-- | drivers/net/stmmac/stmmac_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/stmmac/stmmac_ethtool.c index 6d65482e789a..f2695fd180ca 100644 --- a/drivers/net/stmmac/stmmac_ethtool.c +++ b/drivers/net/stmmac/stmmac_ethtool.c | |||
@@ -94,7 +94,7 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev, | |||
94 | { | 94 | { |
95 | struct stmmac_priv *priv = netdev_priv(dev); | 95 | struct stmmac_priv *priv = netdev_priv(dev); |
96 | 96 | ||
97 | if (!priv->is_gmac) | 97 | if (!priv->plat->has_gmac) |
98 | strcpy(info->driver, MAC100_ETHTOOL_NAME); | 98 | strcpy(info->driver, MAC100_ETHTOOL_NAME); |
99 | else | 99 | else |
100 | strcpy(info->driver, GMAC_ETHTOOL_NAME); | 100 | strcpy(info->driver, GMAC_ETHTOOL_NAME); |
@@ -176,7 +176,7 @@ static void stmmac_ethtool_gregs(struct net_device *dev, | |||
176 | 176 | ||
177 | memset(reg_space, 0x0, REG_SPACE_SIZE); | 177 | memset(reg_space, 0x0, REG_SPACE_SIZE); |
178 | 178 | ||
179 | if (!priv->is_gmac) { | 179 | if (!priv->plat->has_gmac) { |
180 | /* MAC registers */ | 180 | /* MAC registers */ |
181 | for (i = 0; i < 12; i++) | 181 | for (i = 0; i < 12; i++) |
182 | reg_space[i] = readl(priv->ioaddr + (i * 4)); | 182 | reg_space[i] = readl(priv->ioaddr + (i * 4)); |