]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
clk: clk-gpio: use dev_err_probe for gpio-get failure
authorHeiko Stuebner <heiko@sntech.de>
Fri, 6 Sep 2024 08:25:09 +0000 (10:25 +0200)
committerStephen Boyd <sboyd@kernel.org>
Tue, 15 Oct 2024 23:04:19 +0000 (16:04 -0700)
This is a real driver and dev_err_probe will hide the distinction between
EPROBE_DEFER and other errors automatically, so there is no need to
open-code this.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20240906082511.2963890-4-heiko@sntech.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/clk-gpio.c

index 98415782f9a2d0f42aeb4c09f73d713d51032cb2..cda362a2eca03a8ce3d5610415b1effe5f293ca7 100644 (file)
@@ -200,7 +200,6 @@ static int gpio_clk_driver_probe(struct platform_device *pdev)
        struct gpio_desc *gpiod;
        struct clk_hw *hw;
        bool is_mux;
-       int ret;
 
        is_mux = of_device_is_compatible(node, "gpio-mux-clock");
 
@@ -212,17 +211,9 @@ static int gpio_clk_driver_probe(struct platform_device *pdev)
 
        gpio_name = is_mux ? "select" : "enable";
        gpiod = devm_gpiod_get(dev, gpio_name, GPIOD_OUT_LOW);
-       if (IS_ERR(gpiod)) {
-               ret = PTR_ERR(gpiod);
-               if (ret == -EPROBE_DEFER)
-                       pr_debug("%pOFn: %s: GPIOs not yet available, retry later\n",
-                                       node, __func__);
-               else
-                       pr_err("%pOFn: %s: Can't get '%s' named GPIO property\n",
-                                       node, __func__,
-                                       gpio_name);
-               return ret;
-       }
+       if (IS_ERR(gpiod))
+               return dev_err_probe(dev, PTR_ERR(gpiod),
+                                    "Can't get '%s' named GPIO property\n", gpio_name);
 
        if (is_mux)
                hw = clk_hw_register_gpio_mux(dev, gpiod);