zhao
b34543084f
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 8s
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From 36abe81d9c3fa200a57ef2363e93a2991e387e19 Mon Sep 17 00:00:00 2001
|
|
From: Heiko Stuebner <heiko@sntech.de>
|
|
Date: Fri, 6 Sep 2024 10:25:09 +0200
|
|
Subject: clk: clk-gpio: use dev_err_probe for gpio-get failure
|
|
|
|
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>
|
|
|
|
--- a/drivers/clk/clk-gpio.c
|
|
+++ b/drivers/clk/clk-gpio.c
|
|
@@ -200,7 +200,6 @@ static int gpio_clk_driver_probe(struct
|
|
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
|
|
|
|
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);
|