mux: gpio: Simplify code by using dev_err_probe()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 30 Mar 2021 19:33:25 +0000 (22:33 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Apr 2021 14:28:53 +0000 (16:28 +0200)
Use already prepared dev_err_probe() introduced by the commit
a787e5400a1c ("driver core: add device probe log helper").
It simplifies EPROBE_DEFER handling.

Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210330193325.68362-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mux/gpio.c

index 92cc476c916e2159ce2f713ac65e806046955ba5..cc5f2c1861d4a22d984bcd37efb98dd3561ee765 100644 (file)
@@ -66,12 +66,9 @@ static int mux_gpio_probe(struct platform_device *pdev)
        mux_chip->ops = &mux_gpio_ops;
 
        mux_gpio->gpios = devm_gpiod_get_array(dev, "mux", GPIOD_OUT_LOW);
-       if (IS_ERR(mux_gpio->gpios)) {
-               ret = PTR_ERR(mux_gpio->gpios);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "failed to get gpios\n");
-               return ret;
-       }
+       if (IS_ERR(mux_gpio->gpios))
+               return dev_err_probe(dev, PTR_ERR(mux_gpio->gpios),
+                                    "failed to get gpios\n");
        WARN_ON(pins != mux_gpio->gpios->ndescs);
        mux_chip->mux->states = BIT(pins);