From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 3 Apr 2008 00:33:35 +0000 (-0700)
Subject: net: marvell.c fix sparse shadowed variable warning
X-Git-Tag: v2.6.25-rc9~53^2^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5da4e37e59663bd1e9eae1d717e2ceb178a485b8;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 33539917e9b..32a8503a7ac 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;