diff options
Diffstat (limited to 'drivers/net/phy/mdio-mux.c')
| -rw-r--r-- | drivers/net/phy/mdio-mux.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c index aa63cbde97..c4088c16ca 100644 --- a/drivers/net/phy/mdio-mux.c +++ b/drivers/net/phy/mdio-mux.c @@ -37,11 +37,10 @@ static int mdio_mux_read_or_write(struct mii_bus *bus, int phy_id, if (!r) { pb->current_child = cb->bus_number; if (val) - r = pb->mii_bus->write(pb->mii_bus, phy_id, + r = mdiobus_write (pb->mii_bus, phy_id, regnum, *val); else - r = pb->mii_bus->read(pb->mii_bus, phy_id, - regnum); + r = mdiobus_read(pb->mii_bus, phy_id, regnum); } return r; } @@ -57,7 +56,7 @@ static int mdio_mux_write(struct mii_bus *bus, int phy_id, return mdio_mux_read_or_write(bus, phy_id, regnum, &val); } -int mdio_mux_init(struct device_d *dev, +int mdio_mux_init(struct device *dev, struct device_node *mux_node, int (*switch_fn)(int cur, int desired, void *data), void *data, @@ -118,7 +117,7 @@ int mdio_mux_init(struct device_d *dev, cb->mii_bus.parent = dev; cb->mii_bus.read = mdio_mux_read; cb->mii_bus.write = mdio_mux_write; - cb->mii_bus.dev.device_node = child_bus_node; + cb->mii_bus.dev.of_node = child_bus_node; r = mdiobus_register(&cb->mii_bus); if (r) { |