Skip to content

Commit db1a63a

Browse files
lunnkuba-moo
authored andcommitted
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 <[email protected]> Signed-off-by: Michael Walle <[email protected]> Reviewed-by: Russell King (Oracle) <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent bc170f9 commit db1a63a

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/net/phy/mdio_bus.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -917,11 +917,6 @@ int __mdiobus_modify_changed(struct mii_bus *bus, int addr, u32 regnum,
917917
}
918918
EXPORT_SYMBOL_GPL(__mdiobus_modify_changed);
919919

920-
static u32 mdiobus_c45_addr(int devad, u16 regnum)
921-
{
922-
return MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | regnum;
923-
}
924-
925920
/**
926921
* __mdiobus_c45_read - Unlocked version of the mdiobus_c45_read function
927922
* @bus: the mii_bus struct
@@ -942,7 +937,7 @@ int __mdiobus_c45_read(struct mii_bus *bus, int addr, int devad, u32 regnum)
942937
if (bus->read_c45)
943938
retval = bus->read_c45(bus, addr, devad, regnum);
944939
else
945-
retval = bus->read(bus, addr, mdiobus_c45_addr(devad, regnum));
940+
retval = -EOPNOTSUPP;
946941

947942
trace_mdio_access(bus, 1, addr, regnum, retval, retval);
948943
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,
973968
if (bus->write_c45)
974969
err = bus->write_c45(bus, addr, devad, regnum, val);
975970
else
976-
err = bus->write(bus, addr, mdiobus_c45_addr(devad, regnum),
977-
val);
971+
err = -EOPNOTSUPP;
978972

979973
trace_mdio_access(bus, 0, addr, regnum, val, err);
980974
mdiobus_stats_acct(&bus->stats[addr], false, err);

0 commit comments

Comments
 (0)