]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ag71xx: use some dev_err_probe
authorRosen Penev <rosenp@gmail.com>
Mon, 30 Sep 2024 18:18:20 +0000 (11:18 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 4 Oct 2024 15:56:27 +0000 (08:56 -0700)
These functions can return EPROBE_DEFER. Don't warn in such a case.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20240930181823.288892-3-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/atheros/ag71xx.c

index 9c85450ce859740f6ab44c494c9d8385781a5c82..195354b0a18752233b2a00418e34d03f4314a118 100644 (file)
@@ -1822,10 +1822,9 @@ static int ag71xx_probe(struct platform_device *pdev)
        }
 
        clk_eth = devm_clk_get_enabled(&pdev->dev, "eth");
-       if (IS_ERR(clk_eth)) {
-               netif_err(ag, probe, ndev, "Failed to get eth clk.\n");
-               return PTR_ERR(clk_eth);
-       }
+       if (IS_ERR(clk_eth))
+               return dev_err_probe(&pdev->dev, PTR_ERR(clk_eth),
+                                    "Failed to get eth clk.");
 
        SET_NETDEV_DEV(ndev, &pdev->dev);
 
@@ -1836,10 +1835,9 @@ static int ag71xx_probe(struct platform_device *pdev)
        memcpy(ag->fifodata, dcfg->fifodata, sizeof(ag->fifodata));
 
        ag->mac_reset = devm_reset_control_get(&pdev->dev, "mac");
-       if (IS_ERR(ag->mac_reset)) {
-               netif_err(ag, probe, ndev, "missing mac reset\n");
-               return PTR_ERR(ag->mac_reset);
-       }
+       if (IS_ERR(ag->mac_reset))
+               return dev_err_probe(&pdev->dev, PTR_ERR(ag->mac_reset),
+                                    "missing mac reset");
 
        ag->mac_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(ag->mac_base))
@@ -1920,10 +1918,9 @@ static int ag71xx_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ndev);
 
        err = ag71xx_phylink_setup(ag);
-       if (err) {
-               netif_err(ag, probe, ndev, "failed to setup phylink (%d)\n", err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err,
+                                    "failed to setup phylink");
 
        err = devm_register_netdev(&pdev->dev, ndev);
        if (err) {