Commit 443a98e6 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard 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: default avatarVinod Koul <vkoul@kernel.org>
parent f6ee6c84

drivers/soundwire/bus.c

+5 −10
Original line number Diff line number Diff line
@@ -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;

	}