[PATCHv3 net-next] net: dsa: b53: srab: propagate errors from init helpers
From: Rosen Penev <hidden>
Date: 2026-07-29 20:29:58
Also in:
lkml
Subsystem:
broadcom b53/sf2 ethernet switch driver, networking drivers, networking [dsa], the rest · Maintainers:
Florian Fainelli, Jonas Gorski, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Torvalds
Convert b53_srab_prepare_irq() and b53_srab_mux_init() from void to int-returning functions so probe failures are properly propagated. b53_srab_prepare_irq() now returns -ENOMEM on allocation failure and -EPROBE_DEFER if any port IRQ is not yet available. b53_srab_mux_init() now returns PTR_ERR on ioremap failure instead of silently ignoring it. Check and propagate both return values in b53_srab_probe() so the driver core sees the real error instead of always reaching b53_switch_register(). Add error handling in probe as a result of b53_srab_prepare_irq(). Move mux_config out of private struct. This was needed when devm was not used. Assisted-by: Opencode:Big-Pickle Signed-off-by: Rosen Penev <redacted> --- v3: move mux_config to function. v2: address memory leak in b53_srab_prepare_irq(). drivers/net/dsa/b53/b53_srab.c | 46 ++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 13 deletions(-)
diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
index b9939bbd2cd5..81bfd5cd1022 100644
--- a/drivers/net/dsa/b53/b53_srab.c
+++ b/drivers/net/dsa/b53/b53_srab.c@@ -84,7 +84,6 @@ struct b53_srab_port_priv { struct b53_srab_priv { void __iomem *regs; - void __iomem *mux_config; struct b53_srab_port_priv port_intrs[B53_N_PORTS]; };
@@ -531,7 +530,7 @@ static void b53_srab_intr_set(struct b53_srab_priv *priv, bool set) writel(reg, priv->regs + B53_SRAB_CTRLS); } -static void b53_srab_prepare_irq(struct platform_device *pdev) +static int b53_srab_prepare_irq(struct platform_device *pdev) { struct b53_device *dev = platform_get_drvdata(pdev); struct b53_srab_priv *priv = dev->priv;
@@ -551,32 +550,37 @@ static void b53_srab_prepare_irq(struct platform_device *pdev) name = kasprintf(GFP_KERNEL, "link_state_p%d", i); if (!name) - return; + return -ENOMEM; port->num = i; port->dev = dev; port->irq = platform_get_irq_byname_optional(pdev, name); kfree(name); + if (port->irq == -EPROBE_DEFER) + return port->irq; } b53_srab_intr_set(priv, true); + + return 0; } -static void b53_srab_mux_init(struct platform_device *pdev) +static int b53_srab_mux_init(struct platform_device *pdev) { struct b53_device *dev = platform_get_drvdata(pdev); struct b53_srab_priv *priv = dev->priv; struct b53_srab_port_priv *p; + void __iomem *mux_config; unsigned int port; u32 reg, off = 0; int ret; - if (dev->pdata && dev->pdata->chip_id != BCM58XX_DEVICE_ID) - return; + if (!dev->pdata || dev->pdata->chip_id != BCM58XX_DEVICE_ID) + return 0; - priv->mux_config = devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(priv->mux_config)) - return; + mux_config = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(mux_config)) + return PTR_ERR(mux_config); /* Obtain the port mux configuration so we know which lanes * actually map to SerDes lanes
@@ -584,7 +588,7 @@ static void b53_srab_mux_init(struct platform_device *pdev) for (port = 5; port > 3; port--, off += 4) { p = &priv->port_intrs[port]; - reg = readl(priv->mux_config + B53_MUX_CONFIG_P5 + off); + reg = readl(mux_config + B53_MUX_CONFIG_P5 + off); switch (reg & MUX_CONFIG_MASK) { case MUX_CONFIG_SGMII: p->mode = PHY_INTERFACE_MODE_SGMII;
@@ -613,6 +617,8 @@ static void b53_srab_mux_init(struct platform_device *pdev) dev_info(&pdev->dev, "Port %d mode: %s\n", port, phy_modes(p->mode)); } + + return 0; } static int b53_srab_probe(struct platform_device *pdev)
@@ -622,6 +628,7 @@ static int b53_srab_probe(struct platform_device *pdev) const struct of_device_id *of_id = NULL; struct b53_srab_priv *priv; struct b53_device *dev; + int err; if (dn) of_id = of_match_node(b53_srab_of_match, dn);
@@ -651,10 +658,23 @@ static int b53_srab_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dev); - b53_srab_prepare_irq(pdev); - b53_srab_mux_init(pdev); + err = b53_srab_prepare_irq(pdev); + if (err) + return err; + + err = b53_srab_mux_init(pdev); + if (err) + goto err_irq; + + err = b53_switch_register(dev); + if (err) + goto err_irq; + + return 0; - return b53_switch_register(dev); +err_irq: + b53_srab_intr_set(priv, false); + return err; } static void b53_srab_remove(struct platform_device *pdev)
--
2.55.0