[PATCH net-next 1/2] net: dsa: microchip: Drop unnecessary check in ksz9477 PCS setup

From: Maxime Chevallier

Date: Tue Mar 24 2026 - 14:09:39 EST


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@xxxxxxxxxxx>
---
drivers/net/dsa/microchip/ksz9477.c | 55 ++++++++++++++---------------
1 file 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;
}
--
2.49.0