mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
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>
This commit is contained in:
parent
5d51af11f4
commit
7a34bab2da
1 changed files with 10 additions and 18 deletions
|
@ -557,20 +557,16 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
|
|||
dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);
|
||||
|
||||
ret = clk_prepare_enable(i2c->pclk);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to enable clock (%d)\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
if (ret)
|
||||
return dev_err_probe(&pdev->dev, ret, "failed to enable clock\n");
|
||||
i2c->pclkrate = clk_get_rate(i2c->pclk);
|
||||
}
|
||||
|
||||
if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
|
||||
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE) {
|
||||
dev_err(&pdev->dev, "PCLK missing or out of range (%d)\n",
|
||||
i2c->pclkrate);
|
||||
return -EINVAL;
|
||||
}
|
||||
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
|
||||
return dev_err_probe(&pdev->dev, -EINVAL,
|
||||
"PCLK missing or out of range (%d)\n",
|
||||
i2c->pclkrate);
|
||||
|
||||
i2c->base = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(i2c->base))
|
||||
|
@ -582,10 +578,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
ret = devm_request_irq(&pdev->dev, i2c->irq, synquacer_i2c_isr,
|
||||
0, dev_name(&pdev->dev), i2c);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);
|
||||
return ret;
|
||||
}
|
||||
if (ret < 0)
|
||||
return dev_err_probe(&pdev->dev, ret, "cannot claim IRQ %d\n", i2c->irq);
|
||||
|
||||
i2c->state = STATE_IDLE;
|
||||
i2c->dev = &pdev->dev;
|
||||
|
@ -605,10 +599,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
|
|||
synquacer_i2c_hw_init(i2c);
|
||||
|
||||
ret = i2c_add_numbered_adapter(&i2c->adapter);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to add bus to i2c core\n");
|
||||
return ret;
|
||||
}
|
||||
if (ret)
|
||||
return dev_err_probe(&pdev->dev, ret, "failed to add bus to i2c core\n");
|
||||
|
||||
platform_set_drvdata(pdev, i2c);
|
||||
|
||||
|
|
Loading…
Reference in a new issue