net/alacritech: Make use of the helper function dev_err_probe()

Message ID 20210915145734.7145-1-caihuoqing@baidu.com
State New
Headers show
Series
  • net/alacritech: Make use of the helper function dev_err_probe()
Related show

Commit Message

Cai,Huoqing Sept. 15, 2021, 2:57 p.m.
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>
---
 drivers/net/ethernet/alacritech/slicoss.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Lino Sanfilippo Sept. 15, 2021, 9:20 p.m. | #1
Hi,

On 15.09.21 at 16:57, Cai Huoqing wrote:
> 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>
> ---
>  drivers/net/ethernet/alacritech/slicoss.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c
> index 696517eae77f..170ff8c77983 100644
> --- a/drivers/net/ethernet/alacritech/slicoss.c
> +++ b/drivers/net/ethernet/alacritech/slicoss.c
> @@ -1743,10 +1743,8 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	int err;
>
>  	err = pci_enable_device(pdev);
> -	if (err) {
> -		dev_err(&pdev->dev, "failed to enable PCI device\n");
> -		return err;
> -	}
> +	if (err)
> +		return dev_err_probe(&pdev->dev, err, "failed to enable PCI device\n");
>
>  	pci_set_master(pdev);
>  	pci_try_set_mwi(pdev);
>

in which case does pci_enable_device() ever return -EPROBE_DEFER?

Regards,
Lino

Patch

diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c
index 696517eae77f..170ff8c77983 100644
--- a/drivers/net/ethernet/alacritech/slicoss.c
+++ b/drivers/net/ethernet/alacritech/slicoss.c
@@ -1743,10 +1743,8 @@  static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	int err;
 
 	err = pci_enable_device(pdev);
-	if (err) {
-		dev_err(&pdev->dev, "failed to enable PCI device\n");
-		return err;
-	}
+	if (err)
+		return dev_err_probe(&pdev->dev, err, "failed to enable PCI device\n");
 
 	pci_set_master(pdev);
 	pci_try_set_mwi(pdev);