On 06/27/2012 09:29 PM, David Miller wrote:
From: David Daney<ddaney.cavm@xxxxxxxxx>
Date: Wed, 27 Jun 2012 10:33:34 -0700
From: David Daney<david.daney@xxxxxxxxxx>
The only non-cosmetic change from v1 is to pass an additional argument
to get_phy_device() that indicates that the PHY uses 802.3 clause 45
signaling, previously I had been using a high order bit of the addr
parameter for this.
There are also changes from v1 in the code and comment formatting.
These should now be closer to what David Miller prefers.
Applied, but I had to add the following warning fixup:
Thank You.
--------------------
phy: Fix warning in get_phy_device().
drivers/net/phy/phy_device.c: In function ʽget_phy_deviceʼ:
drivers/net/phy/phy_device.c:340:14: warning: ʽphy_idʼ may be used uninitialized in this function [-Wmaybe-uninitialized]
GCC can't see that when we return zero we always initialize
phy_id and that's the only path where we use it.
Initialize phy_id to zero to shut it up.
FWIW: I was testing with GCC-4.6.3 and saw no such warnings.
David Daney
Signed-off-by: David S. Miller<davem@xxxxxxxxxxxxx>
---
drivers/net/phy/phy_device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ef4cdee..47e02e7 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -327,9 +327,9 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
*/
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
{
- struct phy_device *dev = NULL;
- u32 phy_id;
struct phy_c45_device_ids c45_ids = {0};
+ struct phy_device *dev = NULL;
+ u32 phy_id = 0;
int r;
r = get_phy_id(bus, addr,&phy_id, is_c45,&c45_ids);
