Commit 52583c8d authored by Cai Huoqing's avatar Cai Huoqing Committed by David S. Miller
Browse files

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: default avatarCai Huoqing <caihuoqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4fd3ff3b

drivers/net/ethernet/cavium/thunder/nic_main.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+2 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+1 −2
Original line number Diff line number Diff line
@@ -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);