Unverified Commit 87e29107 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: use pm_runtime_resume_and_get() 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

simplify code pattern as recommended by Mark Brown.
parents 9ce170dc 02885dd8

sound/soc/sof/control.c

+1 −2
Original line number Diff line number Diff line
@@ -187,10 +187,9 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _ 
	const struct sof_ipc_tplg_ops *tplg_ops = sdev->ipc->ops->tplg;

	int ret, err;



	ret = pm_runtime_get_sync(scomp->dev);

	ret = pm_runtime_resume_and_get(scomp->dev);

	if (ret < 0 && ret != -EACCES) {

		dev_err_ratelimited(scomp->dev, "%s: failed to resume %d\n", __func__, ret);

		pm_runtime_put_noidle(scomp->dev);

		return ret;

	}

sound/soc/sof/debug.c

+1 −2
Original line number Diff line number Diff line
@@ -229,9 +229,8 @@ static int memory_info_update(struct snd_sof_dev *sdev, char *buf, size_t buff_s 
	if (!reply)

		return -ENOMEM;



	ret = pm_runtime_get_sync(sdev->dev);

	ret = pm_runtime_resume_and_get(sdev->dev);

	if (ret < 0 && ret != -EACCES) {

		pm_runtime_put_noidle(sdev->dev);

		dev_err(sdev->dev, "error: enabling device failed: %d\n", ret);

		goto error;

	}

sound/soc/sof/sof-client-ipc-msg-injector.c

+1 −2
Original line number Diff line number Diff line
@@ -83,10 +83,9 @@ static ssize_t sof_msg_inject_dfs_write(struct file *file, const char __user *bu 
	if (size != count)

		return size > 0 ? -EFAULT : size;



	ret = pm_runtime_get_sync(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0 && ret != -EACCES) {

		dev_err_ratelimited(dev, "debugfs write failed to resume %d\n", ret);

		pm_runtime_put_noidle(dev);

		return ret;

	}