soundwire: bus: use pm_runtime_resume_and_get()

Use pm_runtime_resume_and_get() to replace the pm_runtime_get_sync() and
pm_runtime_put_noidle() pattern.

No functional changes.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220426235623.4253-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 8b7a680f388e64bb3a8d192dc4d8fff31a9766bd..a2bfb0434a6750c0613178495ba9d084a80e95a7 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -536,11 +536,9 @@ int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val)
 {
        int ret;
 
-       ret = pm_runtime_get_sync(&slave->dev);
-       if (ret < 0 && ret != -EACCES) {
-               pm_runtime_put_noidle(&slave->dev);
+       ret = pm_runtime_resume_and_get(&slave->dev);
+       if (ret < 0 && ret != -EACCES)
                return ret;
-       }
 
        ret = sdw_nread_no_pm(slave, addr, count, val);
 
@@ -562,11 +560,9 @@ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, const u8 *val)
 {
        int ret;
 
-       ret = pm_runtime_get_sync(&slave->dev);
-       if (ret < 0 && ret != -EACCES) {
-               pm_runtime_put_noidle(&slave->dev);
+       ret = pm_runtime_resume_and_get(&slave->dev);
+       if (ret < 0 && ret != -EACCES)
                return ret;
-       }
 
        ret = sdw_nwrite_no_pm(slave, addr, count, val);
 
@@ -1506,10 +1502,9 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
 
        sdw_modify_slave_status(slave, SDW_SLAVE_ALERT);
 
-       ret = pm_runtime_get_sync(&slave->dev);
+       ret = pm_runtime_resume_and_get(&slave->dev);
        if (ret < 0 && ret != -EACCES) {
                dev_err(&slave->dev, "Failed to resume device: %d\n", ret);
-               pm_runtime_put_noidle(&slave->dev);
                return ret;
        }