From: Maxime Chevallier <maxime.chevallier@bootlin.com>
To: Andrew Lunn <andrew@lunn.ch>, Jakub Kicinski <kuba@kernel.org>,
davem@davemloft.net, Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Woojung Huh <woojung.huh@microchip.com>,
Vladimir Oltean <olteanv@gmail.com>,
UNGLinuxDriver@microchip.com
Cc: Maxime Chevallier <maxime.chevallier@bootlin.com>,
thomas.petazzoni@bootlin.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/2] net: dsa: microchip: Drop unnecessary check in ksz9477 PCS setup
Date: Tue, 24 Mar 2026 19:08:24 +0100 [thread overview]
Message-ID: <20260324180826.524327-2-maxime.chevallier@bootlin.com> (raw)
In-Reply-To: <20260324180826.524327-1-maxime.chevallier@bootlin.com>
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>
---
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
next prev parent reply other threads:[~2026-03-24 18:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-24 18:08 [PATCH net-next 0/2] net: dsa: microchip: Small cleanups for ksz9477 SGMII Maxime Chevallier
2026-03-24 18:08 ` Maxime Chevallier [this message]
2026-03-24 20:37 ` [PATCH net-next 1/2] net: dsa: microchip: Drop unnecessary check in ksz9477 PCS setup Vladimir Oltean
2026-03-24 18:08 ` [PATCH net-next 2/2] net: dsa: microchip: drop an outdated comment about SGMII support Maxime Chevallier
2026-03-24 20:37 ` Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260324180826.524327-2-maxime.chevallier@bootlin.com \
--to=maxime.chevallier@bootlin.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox