clk: core: clarify the check for runtime PM

Currently, the core->dev entry is populated only if runtime PM is
enabled. Doing so prevents accessing the device structure in any
case.

Keep the same logic but instead of using the presence of core->dev as
the only condition, also check the status of
pm_runtime_enabled(). Then, we can set the core->dev pointer at any
time as long as a device structure is available.

This change will help supporting device links in the clock subsystem.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Jeffrey Hugo <jhugo@codeaurora.org>
Cc: Chen-Yu Tsai <wens@csie.org>
[sboyd@kernel.org: Change to a boolean flag]
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index fef937ea44f4a9bfe0877802a6b9bf680f7fb5e6..d46e8b9b9c9f57d503e180018b625fb265422519 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -57,6 +57,7 @@ struct clk_core {
        struct clk_core         *new_child;
        unsigned long           flags;
        bool                    orphan;
+       bool                    rpm_enabled;
        unsigned int            enable_count;
        unsigned int            prepare_count;
        unsigned int            protect_count;
@@ -92,9 +93,9 @@ struct clk {
 /***           runtime pm          ***/
 static int clk_pm_runtime_get(struct clk_core *core)
 {
-       int ret = 0;
+       int ret;
 
-       if (!core->dev)
+       if (!core->rpm_enabled)
                return 0;
 
        ret = pm_runtime_get_sync(core->dev);
@@ -103,7 +104,7 @@ static int clk_pm_runtime_get(struct clk_core *core)
 
 static void clk_pm_runtime_put(struct clk_core *core)
 {
-       if (!core->dev)
+       if (!core->rpm_enabled)
                return;
 
        pm_runtime_put_sync(core->dev);
@@ -223,7 +224,7 @@ static bool clk_core_is_enabled(struct clk_core *core)
         * taking enable spinlock, but the below check is needed if one tries
         * to call it from other places.
         */
-       if (core->dev) {
+       if (core->rpm_enabled) {
                pm_runtime_get_noresume(core->dev);
                if (!pm_runtime_active(core->dev)) {
                        ret = false;
@@ -233,7 +234,7 @@ static bool clk_core_is_enabled(struct clk_core *core)
 
        ret = core->ops->is_enabled(core->hw);
 done:
-       if (core->dev)
+       if (core->rpm_enabled)
                pm_runtime_put(core->dev);
 
        return ret;
@@ -3341,7 +3342,8 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw)
        core->ops = hw->init->ops;
 
        if (dev && pm_runtime_enabled(dev))
-               core->dev = dev;
+               core->rpm_enabled = true;
+       core->dev = dev;
        if (dev && dev->driver)
                core->owner = dev->driver->owner;
        core->hw = hw;