i2c: nomadik: Use dev_err_probe() whenever possible

Make use of dev_err_probe() in order to simplify the code and
avoid printing when returning EPROBE_DEFER.

Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 2141ba0..1e5fd23 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -1000,16 +1000,14 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
        dev->irq = adev->irq[0];
        ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,
                                DRIVER_NAME, dev);
-       if (ret) {
-               dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&adev->dev, ret,
+                                    "cannot claim the irq %d\n", dev->irq);
 
        dev->clk = devm_clk_get_enabled(&adev->dev, NULL);
-       if (IS_ERR(dev->clk)) {
-               dev_err(&adev->dev, "could enable i2c clock\n");
-               return PTR_ERR(dev->clk);
-       }
+       if (IS_ERR(dev->clk))
+               return dev_err_probe(&adev->dev, PTR_ERR(dev->clk),
+                                    "could enable i2c clock\n");
 
        init_hw(dev);