diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2023-01-19 14:06:57 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-20 18:12:45 -0800 |
| commit | db1a63aed89cec0c9a0674a1a09b7614f4a3ffc2 (patch) | |
| tree | d2c1650f9eb37a647c0475127a0d74818c1543e2 /drivers/net/phy/mdio_bus.c | |
| parent | bc170f96c00b00b8865c223ff3f650f689817fe0 (diff) | |
net: phy: Remove fallback to old C45 method
Now that all MDIO bus drivers which support C45 implement the c45
specific ops, remove the fallback to the old method.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index fb633fa3e872..6a18a92b5ae3 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -917,11 +917,6 @@ int __mdiobus_modify_changed(struct mii_bus *bus, int addr, u32 regnum, } EXPORT_SYMBOL_GPL(__mdiobus_modify_changed); -static u32 mdiobus_c45_addr(int devad, u16 regnum) -{ - return MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | regnum; -} - /** * __mdiobus_c45_read - Unlocked version of the mdiobus_c45_read function * @bus: the mii_bus struct @@ -942,7 +937,7 @@ int __mdiobus_c45_read(struct mii_bus *bus, int addr, int devad, u32 regnum) if (bus->read_c45) retval = bus->read_c45(bus, addr, devad, regnum); else - retval = bus->read(bus, addr, mdiobus_c45_addr(devad, regnum)); + retval = -EOPNOTSUPP; trace_mdio_access(bus, 1, addr, regnum, retval, retval); mdiobus_stats_acct(&bus->stats[addr], true, retval); @@ -973,8 +968,7 @@ int __mdiobus_c45_write(struct mii_bus *bus, int addr, int devad, u32 regnum, if (bus->write_c45) err = bus->write_c45(bus, addr, devad, regnum, val); else - err = bus->write(bus, addr, mdiobus_c45_addr(devad, regnum), - val); + err = -EOPNOTSUPP; trace_mdio_access(bus, 0, addr, regnum, val, err); mdiobus_stats_acct(&bus->stats[addr], false, err); |