From: Yann Sionneau Date: Fri, 25 Aug 2023 14:32:34 +0000 (+0200) Subject: i2c: at91: Use dev_err_probe() instead of dev_err() X-Git-Tag: v6.6-rc1~64^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ab4bcf0e9471c1a3f5e4721ee486f6ed1a76bac;p=thirdparty%2Fkernel%2Flinux.git i2c: at91: Use dev_err_probe() instead of dev_err() Change if (IS_ERR(x)) { dev_err(...); return PTR_ERR(x); } into return dev_err_probe() Also, return the correct error instead of hardcoding -ENODEV This change has also the advantage of handling the -EPROBE_DEFER situation. Signed-off-by: Yann Sionneau Reviewed-by: Andi Shyti Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/busses/i2c-at91-core.c b/drivers/i2c/busses/i2c-at91-core.c index 91d66ec145884..db45554327aed 100644 --- a/drivers/i2c/busses/i2c-at91-core.c +++ b/drivers/i2c/busses/i2c-at91-core.c @@ -222,10 +222,9 @@ static int at91_twi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dev); dev->clk = devm_clk_get(dev->dev, NULL); - if (IS_ERR(dev->clk)) { - dev_err(dev->dev, "no clock defined\n"); - return -ENODEV; - } + if (IS_ERR(dev->clk)) + return dev_err_probe(dev->dev, PTR_ERR(dev->clk), "no clock defined\n"); + clk_prepare_enable(dev->clk); snprintf(dev->adapter.name, sizeof(dev->adapter.name), "AT91");