summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-03 02:33:35 +0200
committerJeff Garzik <jeff@garzik.org>2008-04-04 23:26:15 +0200
commit5da4e37e59663bd1e9eae1d717e2ceb178a485b8 (patch)
tree30ee6ad85d368c4c6dbdec209583faf152f4bf0f
parent[TG3]: Add PHY workaround for 5784 (diff)
downloadlinux-5da4e37e59663bd1e9eae1d717e2ceb178a485b8.tar.xz
linux-5da4e37e59663bd1e9eae1d717e2ceb178a485b8.zip
net: marvell.c fix sparse shadowed variable warning
The other if blocks don't redeclare temp, remove the redeclaration in the final if() block. drivers/net/phy/marvell.c:214:7: warning: symbol 'temp' shadows an earlier one drivers/net/phy/marvell.c:160:6: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/phy/marvell.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 33539917e9b8..32a8503a7acd 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -211,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
}
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
- int temp;
-
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
if (temp < 0)
return temp;