| Message ID | 20210915145804.7357-1-caihuoqing@baidu.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: cadence: macb: Make use of the helper function dev_err_probe() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: line length of 90 exceeds 80 columns |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On 15/09/2021 at 16:58, Cai Huoqing wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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. Well, I don't see where the PROBE_DEFER error could be triggered by the call graph of this function: can you please point me to where this error could come from? Best regards, Nicolas > And using dev_err_probe() can reduce code size, and simplify the code. > > Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> NACK, for now. > --- > drivers/net/ethernet/cadence/macb_pci.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c > index 8b7b59908a1a..d09c570a15ae 100644 > --- a/drivers/net/ethernet/cadence/macb_pci.c > +++ b/drivers/net/ethernet/cadence/macb_pci.c > @@ -35,10 +35,8 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > /* enable pci device */ > err = pcim_enable_device(pdev); > - if (err < 0) { > - dev_err(&pdev->dev, "Enabling PCI device has failed: %d", err); > - return err; > - } > + if (err < 0) > + return dev_err_probe(&pdev->dev, err, "Enabling PCI device has failed\n"); > > pci_set_master(pdev); > > -- > 2.25.1 >
diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c index 8b7b59908a1a..d09c570a15ae 100644 --- a/drivers/net/ethernet/cadence/macb_pci.c +++ b/drivers/net/ethernet/cadence/macb_pci.c @@ -35,10 +35,8 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* enable pci device */ err = pcim_enable_device(pdev); - if (err < 0) { - dev_err(&pdev->dev, "Enabling PCI device has failed: %d", err); - return err; - } + if (err < 0) + return dev_err_probe(&pdev->dev, err, "Enabling PCI device has failed\n"); pci_set_master(pdev);
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/cadence/macb_pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)