diff options
| author | Liao Chang <liaochang1@huawei.com> | 2023-08-08 09:29:46 +0800 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2023-08-10 10:12:22 +0200 |
| commit | 7aec2f39a1a4be99a7872e2342a69b96396c3e0c (patch) | |
| tree | d1a241617411768ac148641548bac5871f7e35bc /drivers/i2c | |
| parent | 0c89b3257b04950b4d66e9739af3e50bf93c74de (diff) | |
| download | linux-stable-7aec2f39a1a4be99a7872e2342a69b96396c3e0c.tar.gz linux-stable-7aec2f39a1a4be99a7872e2342a69b96396c3e0c.tar.bz2 linux-stable-7aec2f39a1a4be99a7872e2342a69b96396c3e0c.zip | |
i2c: bcm2835: 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: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20230808012954.1643834-2-liaochang1@huawei.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-bcm2835.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index 8ce6d3f49551..9af1a68269ab 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -430,10 +430,9 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) i2c_dev->bus_clk = bcm2835_i2c_register_div(&pdev->dev, mclk, i2c_dev); - if (IS_ERR(i2c_dev->bus_clk)) { - dev_err(&pdev->dev, "Could not register clock\n"); - return PTR_ERR(i2c_dev->bus_clk); - } + if (IS_ERR(i2c_dev->bus_clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2c_dev->bus_clk), + "Could not register clock\n"); ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency", &bus_clk_rate); @@ -444,10 +443,9 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) } ret = clk_set_rate_exclusive(i2c_dev->bus_clk, bus_clk_rate); - if (ret < 0) { - dev_err(&pdev->dev, "Could not set clock frequency\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "Could not set clock frequency\n"); ret = clk_prepare_enable(i2c_dev->bus_clk); if (ret) { |