Skip to content

Commit 7a34bab

Browse files
Liao ChangAndi Shyti
Liao Chang
authored and
Andi Shyti
committed
i2c: synquacer: Use dev_err_probe in probe function
Use the dev_err_probe function instead of dev_err in the probe function so that the printed message includes the return value and also handles -EPROBE_DEFER nicely. Signed-off-by: Liao Chang <liaochang1@huawei.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Link: https://lore.kernel.org/r/20230808012954.1643834-10-liaochang1@huawei.com Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 5d51af1 commit 7a34bab

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

drivers/i2c/busses/i2c-synquacer.c

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -557,20 +557,16 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
557557
dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);
558558

559559
ret = clk_prepare_enable(i2c->pclk);
560-
if (ret) {
561-
dev_err(&pdev->dev, "failed to enable clock (%d)\n",
562-
ret);
563-
return ret;
564-
}
560+
if (ret)
561+
return dev_err_probe(&pdev->dev, ret, "failed to enable clock\n");
565562
i2c->pclkrate = clk_get_rate(i2c->pclk);
566563
}
567564

568565
if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
569-
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE) {
570-
dev_err(&pdev->dev, "PCLK missing or out of range (%d)\n",
571-
i2c->pclkrate);
572-
return -EINVAL;
573-
}
566+
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
567+
return dev_err_probe(&pdev->dev, -EINVAL,
568+
"PCLK missing or out of range (%d)\n",
569+
i2c->pclkrate);
574570

575571
i2c->base = devm_platform_ioremap_resource(pdev, 0);
576572
if (IS_ERR(i2c->base))
@@ -582,10 +578,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
582578

583579
ret = devm_request_irq(&pdev->dev, i2c->irq, synquacer_i2c_isr,
584580
0, dev_name(&pdev->dev), i2c);
585-
if (ret < 0) {
586-
dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);
587-
return ret;
588-
}
581+
if (ret < 0)
582+
return dev_err_probe(&pdev->dev, ret, "cannot claim IRQ %d\n", i2c->irq);
589583

590584
i2c->state = STATE_IDLE;
591585
i2c->dev = &pdev->dev;
@@ -605,10 +599,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
605599
synquacer_i2c_hw_init(i2c);
606600

607601
ret = i2c_add_numbered_adapter(&i2c->adapter);
608-
if (ret) {
609-
dev_err(&pdev->dev, "failed to add bus to i2c core\n");
610-
return ret;
611-
}
602+
if (ret)
603+
return dev_err_probe(&pdev->dev, ret, "failed to add bus to i2c core\n");
612604

613605
platform_set_drvdata(pdev, i2c);
614606

0 commit comments

Comments
 (0)