| Message ID | 8022143.T7Z3S40VBb@eto.sf-tec.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/3] sunhme: remove unused tx_dump_ring() | expand |
On 2/3/22 11:23 AM, Rolf Eike Beer wrote: > This already returns a proper error value, so pass it to the caller. > > Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> > --- > drivers/net/ethernet/sun/sunhme.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c > index 43834339bb43..980a936ce8d1 100644 > --- a/drivers/net/ethernet/sun/sunhme.c > +++ b/drivers/net/ethernet/sun/sunhme.c > @@ -2969,11 +2969,12 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, > strcpy(prom_name, "SUNW,hme"); > #endif > > - err = -ENODEV; > + err = pci_enable_device(pdev); > > - if (pci_enable_device(pdev)) > + if (err) > goto err_out; > pci_set_master(pdev); > + err = -ENODEV; > if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) { > qp = quattro_pci_find(pdev); > This is incrementally better, but there are several more calls like this. A follow up converting those as well would be good. Reviewed-by: Sean Anderson <seanga2@gmail.com>
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 43834339bb43..980a936ce8d1 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -2969,11 +2969,12 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, strcpy(prom_name, "SUNW,hme"); #endif - err = -ENODEV; + err = pci_enable_device(pdev); - if (pci_enable_device(pdev)) + if (err) goto err_out; pci_set_master(pdev); + err = -ENODEV; if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) { qp = quattro_pci_find(pdev);
This already returns a proper error value, so pass it to the caller. Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> --- drivers/net/ethernet/sun/sunhme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)