net: netsec: Make use of the helper function dev_err_probe()

When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
And using dev_err_probe() can reduce code size, and the error value
gets printed.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index 1f46af1..f80a2ae 100644 (file)
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1860,10 +1860,9 @@ static int netsec_of_probe(struct platform_device *pdev,
        *phy_addr = of_mdio_parse_addr(&pdev->dev, priv->phy_np);
 
        priv->clk = devm_clk_get(&pdev->dev, NULL); /* get by 'phy_ref_clk' */
-       if (IS_ERR(priv->clk)) {
-               dev_err(&pdev->dev, "phy_ref_clk not found\n");
-               return PTR_ERR(priv->clk);
-       }
+       if (IS_ERR(priv->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(priv->clk),
+                                    "phy_ref_clk not found\n");
        priv->freq = clk_get_rate(priv->clk);
 
        return 0;
@@ -1886,19 +1885,17 @@ static int netsec_acpi_probe(struct platform_device *pdev,
        priv->phy_interface = PHY_INTERFACE_MODE_NA;
 
        ret = device_property_read_u32(&pdev->dev, "phy-channel", phy_addr);
-       if (ret) {
-               dev_err(&pdev->dev,
-                       "missing required property 'phy-channel'\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "missing required property 'phy-channel'\n");
 
        ret = device_property_read_u32(&pdev->dev,
                                       "socionext,phy-clock-frequency",
                                       &priv->freq);
        if (ret)
-               dev_err(&pdev->dev,
-                       "missing required property 'socionext,phy-clock-frequency'\n");
-       return ret;
+               return dev_err_probe(&pdev->dev, ret,
+                                    "missing required property 'socionext,phy-clock-frequency'\n");
+       return 0;
 }
 
 static void netsec_unregister_mdio(struct netsec_priv *priv)