diff options
| author | Maxime Chevallier <maxime.chevallier@bootlin.com> | 2026-03-24 19:08:24 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-03-26 18:55:19 -0700 |
| commit | e1da0e1859c612ca81d05518cb908642c00c2e93 (patch) | |
| tree | 4187ffddeff8084cdb58fe7db33d0f477dae8f43 /drivers/net/dsa/microchip | |
| parent | 5f70b0aa08ada1004259902dbee3b401ac2f7dcb (diff) | |
| download | lwn-e1da0e1859c612ca81d05518cb908642c00c2e93.tar.gz lwn-e1da0e1859c612ca81d05518cb908642c00c2e93.zip | |
net: dsa: microchip: Drop unnecessary check in ksz9477 PCS setup
The ksz_dev_ops .pcs_create() is called under the assumption that the
switch has a PCS port :
if (ksz_has_sgmii_port(dev) && dev->dev_ops->pcs_create) {
ret = dev->dev_ops->pcs_create(dev);
[...]
}
The KSZ9477 implementation of .pcs_create() does the same check on
ksz_has_sgmii_port(), and protects the entire function with it.
Drop it, saving a level of indentation and increasing readability.
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/20260324180826.524327-2-maxime.chevallier@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/dsa/microchip')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz9477.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 5416016b33e0..30d8c0146bbb 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -310,36 +310,33 @@ static int ksz9477_pcs_write(struct mii_bus *bus, int phy, int mmd, int reg, int ksz9477_pcs_create(struct ksz_device *dev) { - /* This chip has a SGMII port. */ - if (ksz_has_sgmii_port(dev)) { - int port = ksz_get_sgmii_port(dev); - struct ksz_port *p = &dev->ports[port]; - struct phylink_pcs *pcs; - struct mii_bus *bus; - int ret; - - bus = devm_mdiobus_alloc(dev->dev); - if (!bus) - return -ENOMEM; - - bus->name = "ksz_pcs_mdio_bus"; - snprintf(bus->id, MII_BUS_ID_SIZE, "%s-pcs", - dev_name(dev->dev)); - bus->read_c45 = &ksz9477_pcs_read; - bus->write_c45 = &ksz9477_pcs_write; - bus->parent = dev->dev; - bus->phy_mask = ~0; - bus->priv = dev; - - ret = devm_mdiobus_register(dev->dev, bus); - if (ret) - return ret; + int port = ksz_get_sgmii_port(dev); + struct ksz_port *p = &dev->ports[port]; + struct phylink_pcs *pcs; + struct mii_bus *bus; + int ret; - pcs = xpcs_create_pcs_mdiodev(bus, 0); - if (IS_ERR(pcs)) - return PTR_ERR(pcs); - p->pcs = pcs; - } + bus = devm_mdiobus_alloc(dev->dev); + if (!bus) + return -ENOMEM; + + bus->name = "ksz_pcs_mdio_bus"; + snprintf(bus->id, MII_BUS_ID_SIZE, "%s-pcs", + dev_name(dev->dev)); + bus->read_c45 = &ksz9477_pcs_read; + bus->write_c45 = &ksz9477_pcs_write; + bus->parent = dev->dev; + bus->phy_mask = ~0; + bus->priv = dev; + + ret = devm_mdiobus_register(dev->dev, bus); + if (ret) + return ret; + + pcs = xpcs_create_pcs_mdiodev(bus, 0); + if (IS_ERR(pcs)) + return PTR_ERR(pcs); + p->pcs = pcs; return 0; } |
