]> git.ipfire.org Git - people/ms/linux.git/commitdiff
mfd: wcd934x: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 26 Aug 2020 14:49:35 +0000 (16:49 +0200)
committerLee Jones <lee.jones@linaro.org>
Wed, 30 Sep 2020 15:25:01 +0000 (16:25 +0100)
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and also it prints the error value.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/wcd934x.c

index da910302d51a2c107bb6db5586d2071f4739262e..c274d733b65663972da6a7600dc43ad9122f9a88 100644 (file)
@@ -219,12 +219,9 @@ static int wcd934x_slim_probe(struct slim_device *sdev)
                return  -ENOMEM;
 
        ddata->irq = of_irq_get(np, 0);
-       if (ddata->irq < 0) {
-               if (ddata->irq != -EPROBE_DEFER)
-                       dev_err(ddata->dev, "Failed to get IRQ: err = %d\n",
-                               ddata->irq);
-               return ddata->irq;
-       }
+       if (ddata->irq < 0)
+               return dev_err_probe(ddata->dev, ddata->irq,
+                                    "Failed to get IRQ\n");
 
        reset_gpio = of_get_named_gpio(np, "reset-gpios", 0);
        if (reset_gpio < 0) {