net: thunderx: 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/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 691e147..b3d7d1a 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -1311,9 +1311,8 @@ static int nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        err = pci_enable_device(pdev);
        if (err) {
-               dev_err(dev, "Failed to enable PCI device\n");
                pci_set_drvdata(pdev, NULL);
-               return err;
+               return dev_err_probe(dev, err, "Failed to enable PCI device\n");
        }
 
        err = pci_request_regions(pdev, DRV_NAME);

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index d1667b7..2b87565 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -2119,10 +2119,8 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        err = pci_enable_device(pdev);
-       if (err) {
-               dev_err(dev, "Failed to enable PCI device\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "Failed to enable PCI device\n");
 
        err = pci_request_regions(pdev, DRV_NAME);
        if (err) {

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index c36fed9..db66d4b 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1597,9 +1597,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        err = pcim_enable_device(pdev);
        if (err) {
-               dev_err(dev, "Failed to enable PCI device\n");
                pci_set_drvdata(pdev, NULL);
-               return err;
+               return dev_err_probe(dev, err, "Failed to enable PCI device\n");
        }
 
        err = pci_request_regions(pdev, DRV_NAME);