i2c: rk3x: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 2 Sep 2020 15:06:41 +0000 (17:06 +0200)
committerWolfram Sang <wsa@kernel.org>
Sun, 27 Sep 2020 17:58:56 +0000 (19:58 +0200)
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-rk3x.c

index 8e3cc85..819ab4e 100644 (file)
@@ -1312,18 +1312,13 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
                i2c->pclk = devm_clk_get(&pdev->dev, "pclk");
        }
 
-       if (IS_ERR(i2c->clk)) {
-               ret = PTR_ERR(i2c->clk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "Can't get bus clk: %d\n", ret);
-               return ret;
-       }
-       if (IS_ERR(i2c->pclk)) {
-               ret = PTR_ERR(i2c->pclk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "Can't get periph clk: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(i2c->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(i2c->clk),
+                                    "Can't get bus clk\n");
+
+       if (IS_ERR(i2c->pclk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),
+                                    "Can't get periph clk\n");
 
        ret = clk_prepare(i2c->clk);
        if (ret < 0) {