Skip to content

Commit

Permalink
netdev/phy/icplus: Use mdiobus_write() and mdiobus_read() for proper …
Browse files Browse the repository at this point in the history
…locking.

Usually you have to take the bus lock.  Why not here too?

I saw this when working on something else.  Not even compile tested.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Cc: "Uwe Kleine-Konig" <u.kleine-koenig@pengutronix.de>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Daney authored and David S. Miller committed Sep 30, 2011
1 parent 6fe3264 commit 76231e0
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/phy/icplus.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,36 +49,36 @@ static int ip175c_config_init(struct phy_device *phydev)
if (full_reset_performed == 0) {

/* master reset */
err = phydev->bus->write(phydev->bus, 30, 0, 0x175c);
err = mdiobus_write(phydev->bus, 30, 0, 0x175c);
if (err < 0)
return err;

/* ensure no bus delays overlap reset period */
err = phydev->bus->read(phydev->bus, 30, 0);
err = mdiobus_read(phydev->bus, 30, 0);

/* data sheet specifies reset period is 2 msec */
mdelay(2);

/* enable IP175C mode */
err = phydev->bus->write(phydev->bus, 29, 31, 0x175c);
err = mdiobus_write(phydev->bus, 29, 31, 0x175c);
if (err < 0)
return err;

/* Set MII0 speed and duplex (in PHY mode) */
err = phydev->bus->write(phydev->bus, 29, 22, 0x420);
err = mdiobus_write(phydev->bus, 29, 22, 0x420);
if (err < 0)
return err;

/* reset switch ports */
for (i = 0; i < 5; i++) {
err = phydev->bus->write(phydev->bus, i,
MII_BMCR, BMCR_RESET);
err = mdiobus_write(phydev->bus, i,
MII_BMCR, BMCR_RESET);
if (err < 0)
return err;
}

for (i = 0; i < 5; i++)
err = phydev->bus->read(phydev->bus, i, MII_BMCR);
err = mdiobus_read(phydev->bus, i, MII_BMCR);

mdelay(2);

Expand Down

0 comments on commit 76231e0

Please sign in to comment.