Merge tag 'gcc-plugins-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / mfd / madera-core.c

diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
index 8a8d733..4ed6ad8 100644 (file)
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -369,19 +369,14 @@ EXPORT_SYMBOL_GPL(madera_of_match);
 static int madera_get_reset_gpio(struct madera *madera)
 {
        struct gpio_desc *reset;
-       int ret;
 
        if (madera->pdata.reset)
                return 0;
 
        reset = devm_gpiod_get_optional(madera->dev, "reset", GPIOD_OUT_LOW);
-       if (IS_ERR(reset)) {
-               ret = PTR_ERR(reset);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(madera->dev, "Failed to request /RESET: %d\n",
-                               ret);
-               return ret;
-       }
+       if (IS_ERR(reset))
+               return dev_err_probe(madera->dev, PTR_ERR(reset),
+                               "Failed to request /RESET");
 
        /*
         * A hard reset is needed for full reset of the chip. We allow running