]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
pmdomain: bcm: bcm2835-power: Use devm_clk_get_optional
authorStefan Wahren <wahrenst@gmx.net>
Tue, 15 Apr 2025 19:05:58 +0000 (21:05 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 23 Apr 2025 12:32:13 +0000 (14:32 +0200)
The driver tries to implement optional clock handling with devm_clk_get.
It treats all errors except EPROBE_DEFER as a missing clock, which is
not correct. So use devm_clk_get_optional here and get the corner-cases
right.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20250415190558.16354-1-wahrenst@gmx.net
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/pmdomain/bcm/bcm2835-power.c

index d3cd816979ac909ecd5e3bf064a00f35f01d0c54..f5289fd184d0d65d48dd98acada709767df0129a 100644 (file)
@@ -506,18 +506,10 @@ bcm2835_init_power_domain(struct bcm2835_power *power,
        struct device *dev = power->dev;
        struct bcm2835_power_domain *dom = &power->domains[pd_xlate_index];
 
-       dom->clk = devm_clk_get(dev->parent, name);
-       if (IS_ERR(dom->clk)) {
-               int ret = PTR_ERR(dom->clk);
-
-               if (ret == -EPROBE_DEFER)
-                       return ret;
-
-               /* Some domains don't have a clk, so make sure that we
-                * don't deref an error pointer later.
-                */
-               dom->clk = NULL;
-       }
+       dom->clk = devm_clk_get_optional(dev->parent, name);
+       if (IS_ERR(dom->clk))
+               return dev_err_probe(dev, PTR_ERR(dom->clk), "Failed to get clock %s\n",
+                                                            name);
 
        dom->base.name = name;
        dom->base.flags = GENPD_FLAG_ACTIVE_WAKEUP;