Not all platforms support runtime_pm for now, let's use runtime_pm
only when enabled.

Suggested-by: Srinivas Kandagatla <srinivas.kandaga...@linaro.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.boss...@linux.intel.com>
---
 drivers/soundwire/bus.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 5ad4109dc72f..0a45dc5713df 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -332,12 +332,16 @@ int sdw_nread(struct sdw_slave *slave, u32 addr, size_t 
count, u8 *val)
        if (ret < 0)
                return ret;
 
-       ret = pm_runtime_get_sync(slave->bus->dev);
-       if (ret < 0)
-               return ret;
+       if (pm_runtime_enabled(slave->bus->dev)) {
+               ret = pm_runtime_get_sync(slave->bus->dev);
+               if (ret < 0)
+                       return ret;
+       }
 
        ret = sdw_transfer(slave->bus, &msg);
-       pm_runtime_put(slave->bus->dev);
+
+       if (pm_runtime_enabled(slave->bus->dev))
+               pm_runtime_put(slave->bus->dev);
 
        return ret;
 }
@@ -359,13 +363,16 @@ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t 
count, u8 *val)
                           slave->dev_num, SDW_MSG_FLAG_WRITE, val);
        if (ret < 0)
                return ret;
-
-       ret = pm_runtime_get_sync(slave->bus->dev);
-       if (ret < 0)
-               return ret;
+       if (pm_runtime_enabled(slave->bus->dev)) {
+               ret = pm_runtime_get_sync(slave->bus->dev);
+               if (ret < 0)
+                       return ret;
+       }
 
        ret = sdw_transfer(slave->bus, &msg);
-       pm_runtime_put(slave->bus->dev);
+
+       if (pm_runtime_enabled(slave->bus->dev))
+               pm_runtime_put(slave->bus->dev);
 
        return ret;
 }
-- 
2.20.1

Reply via email to