]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
i2c: cadence: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 2 Sep 2020 15:06:38 +0000 (17:06 +0200)
committerWolfram Sang <wsa@kernel.org>
Wed, 23 Jun 2021 16:22:28 +0000 (18:22 +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>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-cadence.c

index 5a14f026566955b58c4a635d3f3296b838595d8f..565401bfbcc6e512388fe66a11daac5579a4e162 100644 (file)
@@ -1251,11 +1251,10 @@ static int cdns_i2c_probe(struct platform_device *pdev)
                 "Cadence I2C at %08lx", (unsigned long)r_mem->start);
 
        id->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(id->clk)) {
-               if (PTR_ERR(id->clk) != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "input clock not found.\n");
-               return PTR_ERR(id->clk);
-       }
+       if (IS_ERR(id->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(id->clk),
+                                    "input clock not found.\n");
+
        ret = clk_prepare_enable(id->clk);
        if (ret)
                dev_err(&pdev->dev, "Unable to enable clock.\n");