linux-mips
[Top] [All Lists]

[PATCH] netdev/phy: Use mdiobus_read() so that proper locks are taken.

To: netdev@vger.kernel.org, davem@davemloft.net
Subject: [PATCH] netdev/phy: Use mdiobus_read() so that proper locks are taken.
From: David Daney <david.daney@cavium.com>
Date: Fri, 30 Sep 2011 14:51:22 -0700
Cc: linux-mips@linux-mips.org, David Daney <david.daney@cavium.com>
Sender: linux-mips-bounce@linux-mips.org
Accesses to the mdio busses must be done with the mdio_lock to ensure
proper operation.  Conveniently we have the helper function
mdiobus_read() to do that for us.  Lets use it in get_phy_id() instead
of accessing the bus without the lock held.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 drivers/net/phy/phy_device.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ff109fe..83a5a5a 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -213,7 +213,7 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
 
        /* Grab the bits from PHYIR1, and put them
         * in the upper half */
-       phy_reg = bus->read(bus, addr, MII_PHYSID1);
+       phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);
 
        if (phy_reg < 0)
                return -EIO;
@@ -221,7 +221,7 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
        *phy_id = (phy_reg & 0xffff) << 16;
 
        /* Grab the bits from PHYIR2, and put them in the lower half */
-       phy_reg = bus->read(bus, addr, MII_PHYSID2);
+       phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);
 
        if (phy_reg < 0)
                return -EIO;
-- 
1.7.2.3


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] netdev/phy: Use mdiobus_read() so that proper locks are taken., David Daney <=