net: enetc: 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 simplify the code.

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

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 3ca93adb9662826e99f8f734cf4d408f1f4ee717..0c69409fe0d0ad7b4a4ea161a8b6a59019d11632 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2610,10 +2610,8 @@ int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv)
 
        pcie_flr(pdev);
        err = pci_enable_device_mem(pdev);
-       if (err) {
-               dev_err(&pdev->dev, "device enable failed\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err, "device enable failed\n");
 
        /* set up for high or low dma */
        err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 60d94e0a07d6e55a57b169bed3e920947fe1e853..f0ff9509684654f5a4ef5e49ea14b8d8ddb210b2 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -804,10 +804,8 @@ static int enetc_mdio_probe(struct enetc_pf *pf, struct device_node *np)
        snprintf(bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev));
 
        err = of_mdiobus_register(bus, np);
-       if (err) {
-               dev_err(dev, "cannot register MDIO bus\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "cannot register MDIO bus\n");
 
        pf->mdio = bus;
 
@@ -1216,10 +1214,8 @@ static int enetc_pf_probe(struct pci_dev *pdev,
                         ERR_PTR(err));
 
        err = enetc_pci_probe(pdev, KBUILD_MODNAME, sizeof(*pf));
-       if (err) {
-               dev_err(&pdev->dev, "PCI probing failed\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err, "PCI probing failed\n");
 
        si = pci_get_drvdata(pdev);
        if (!si->hw.port || !si->hw.global) {

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
index bc594892507acb2f569975e338886288fbeff062..36b4f51dd297c252941ced52aea1a1c74d58fcec 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
@@ -39,10 +39,8 @@ static int enetc_ptp_probe(struct pci_dev *pdev,
        }
 
        err = pci_enable_device_mem(pdev);
-       if (err) {
-               dev_err(&pdev->dev, "device enable failed\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err, "device enable failed\n");
 
        /* set up for high or low dma */
        err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
index 1a9d1e8b772ce7fa120bc0beadf98f611f7213b6..0704f6bf12fde3ae8f3170c622392124cee17183 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
@@ -143,10 +143,8 @@ static int enetc_vf_probe(struct pci_dev *pdev,
        int err;
 
        err = enetc_pci_probe(pdev, KBUILD_MODNAME, 0);
-       if (err) {
-               dev_err(&pdev->dev, "PCI probing failed\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err, "PCI probing failed\n");
 
        si = pci_get_drvdata(pdev);