Skip to content

Commit

Permalink
net: thunderx: Make use of the helper function dev_err_probe()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Cai Huoqing authored and David S. Miller committed Sep 16, 2021
1 parent 4fd3ff3 commit 52583c8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ethernet/cavium/thunder/nic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/ethernet/cavium/thunder/nicvf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 52583c8

Please sign in to comment.