> Use dev_err_probe() to slightly simplify the code. > It is less verbose, more informational and makes error logging more > consistent in the probe. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> Reviewed-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> > --- > Changes in v3: > - None > > Changes in v2: > - New patch > v2: https://lore.kernel.org/all/1b67aa9ea0245325c3779d32dde46cdf5c232db9.1746715755.git.christophe.jaillet@xxxxxxxxxx/ > > Compile tested only. > --- > drivers/net/ethernet/airoha/airoha_eth.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c > index 2335aa59b06f..7404ee894467 100644 > --- a/drivers/net/ethernet/airoha/airoha_eth.c > +++ b/drivers/net/ethernet/airoha/airoha_eth.c > @@ -2896,10 +2896,9 @@ static int airoha_probe(struct platform_device *pdev) > eth->dev = &pdev->dev; > > err = dma_set_mask_and_coherent(eth->dev, DMA_BIT_MASK(32)); > - if (err) { > - dev_err(eth->dev, "failed configuring DMA mask\n"); > - return err; > - } > + if (err) > + return dev_err_probe(eth->dev, err, > + "failed configuring DMA mask\n"); > > eth->fe_regs = devm_platform_ioremap_resource_byname(pdev, "fe"); > if (IS_ERR(eth->fe_regs)) > @@ -2912,10 +2911,9 @@ static int airoha_probe(struct platform_device *pdev) > err = devm_reset_control_bulk_get_exclusive(eth->dev, > ARRAY_SIZE(eth->rsts), > eth->rsts); > - if (err) { > - dev_err(eth->dev, "failed to get bulk reset lines\n"); > - return err; > - } > + if (err) > + return dev_err_probe(eth->dev, err, > + "failed to get bulk reset lines\n"); > > eth->xsi_rsts[0].id = "xsi-mac"; > eth->xsi_rsts[1].id = "hsi0-mac"; > @@ -2925,10 +2923,9 @@ static int airoha_probe(struct platform_device *pdev) > err = devm_reset_control_bulk_get_exclusive(eth->dev, > ARRAY_SIZE(eth->xsi_rsts), > eth->xsi_rsts); > - if (err) { > - dev_err(eth->dev, "failed to get bulk xsi reset lines\n"); > - return err; > - } > + if (err) > + return dev_err_probe(eth->dev, err, > + "failed to get bulk xsi reset lines\n"); > > eth->napi_dev = alloc_netdev_dummy(0); > if (!eth->napi_dev) > -- > 2.49.0 >
Attachment:
signature.asc
Description: PGP signature
