Re: [PATCH RESEND net-next] net: airoha: Make use of the helper function dev_err_probe()
From: Lorenzo Bianconi <lorenzo@kernel.org>
Date: 2026-06-30 10:38:41
quoted hunk ↗ jump to hunk
From: Lei Zhu <redacted> Use dev_err_probe() to reduce code size and simplify the code. Signed-off-by: Lei Zhu <redacted> --- The last submission was when net-next is closed.Resending it. 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 31cdb11cd78d..189f64e83a46 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c@@ -3071,10 +3071,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));
I do not think dma_set_mask_and_coherent() can return -EPROBE_DEFER, so there is no point adding dev_err_probe() here. Regards, Lorenzo
quoted hunk ↗ jump to hunk
- 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))@@ -3087,10 +3086,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"); xsi_rsts = devm_kcalloc(eth->dev, eth->soc->num_xsi_rsts, sizeof(*xsi_rsts),@@ -3105,10 +3103,9 @@ static int airoha_probe(struct platform_device *pdev) err = devm_reset_control_bulk_get_exclusive(eth->dev, eth->soc->num_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.25.1
Attachments
- signature.asc [application/pgp-signature] 228 bytes