ASoC: SOF: Remove redundant pm_runtime_mark_last_busy() calls

pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to
pm_runtime_mark_last_busy().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20250704075459.3222908-1-sakari.ailus@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c
index 463d418e72001ba068d5f93f5dfe678e8596ed90..a3fd1d523c0940d2ef8c1bef0347daafda3656c9 100644 (file)
--- a/sound/soc/sof/control.c
+++ b/sound/soc/sof/control.c
@@ -196,7 +196,6 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _
        if (tplg_ops && tplg_ops->control && tplg_ops->control->bytes_ext_volatile_get)
                ret = tplg_ops->control->bytes_ext_volatile_get(scontrol, binary_data, size);
 
-       pm_runtime_mark_last_busy(scomp->dev);
        err = pm_runtime_put_autosuspend(scomp->dev);
        if (err < 0)
                dev_err_ratelimited(scomp->dev, "%s: failed to idle %d\n", __func__, err);

diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
index d0ffa1d7114504ee3bcd6c8d4d4c49e23c0efc78..b24943a65c89fb12e4e5b8c589ccafd2dd57c090 100644 (file)
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -217,7 +217,6 @@ static int memory_info_update(struct snd_sof_dev *sdev, char *buf, size_t buff_s
        }
 
        ret = sof_ipc_tx_message(sdev->ipc, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);
-       pm_runtime_mark_last_busy(sdev->dev);
        pm_runtime_put_autosuspend(sdev->dev);
        if (ret < 0 || reply->rhdr.error < 0) {
                ret = min(ret, reply->rhdr.error);

diff --git a/sound/soc/sof/ipc3-dtrace.c b/sound/soc/sof/ipc3-dtrace.c
index 744a91a150bc9c21e7e4163c2dcd13649e785c6d..e5c8fec173c4f2d8dbf413e1e4262f50dbef86fb 100644 (file)
--- a/sound/soc/sof/ipc3-dtrace.c
+++ b/sound/soc/sof/ipc3-dtrace.c
@@ -172,7 +172,6 @@ static int ipc3_trace_update_filter(struct snd_sof_dev *sdev, int num_elems,
                goto error;
        }
        ret = sof_ipc_tx_message_no_reply(sdev->ipc, msg, msg->hdr.size);
-       pm_runtime_mark_last_busy(sdev->dev);
        pm_runtime_put_autosuspend(sdev->dev);
 
 error:

diff --git a/sound/soc/sof/ipc4-loader.c b/sound/soc/sof/ipc4-loader.c
index d2f534d65edf166f2317e561dc217bab3f52bbde..6bcdb495267d5df6a49a491a66e60aa1063470b9 100644 (file)
--- a/sound/soc/sof/ipc4-loader.c
+++ b/sound/soc/sof/ipc4-loader.c
@@ -236,7 +236,6 @@ static int sof_ipc4_load_library(struct snd_sof_dev *sdev, unsigned long lib_id,
 
        ret = ipc4_data->load_library(sdev, fw_lib, false);
 
-       pm_runtime_mark_last_busy(sdev->dev);
        err = pm_runtime_put_autosuspend(sdev->dev);
        if (err < 0)
                dev_err_ratelimited(sdev->dev, "%s: pm_runtime idle failed: %d\n",

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index d584a72e6f52fd26735508e4de26c25ca34a2938..c51d61b18db9dd8420a444d8c3abf1b235ec5c5b 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -728,7 +728,6 @@ static int sof_pcm_probe(struct snd_soc_component *component)
                        ret);
 
 pm_error:
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return ret;

diff --git a/sound/soc/sof/sof-client-ipc-flood-test.c b/sound/soc/sof/sof-client-ipc-flood-test.c
index 11b6f7da28826b7b5e19365c68df317a0dc1920f..373f3a12537216a954e57b02e7074c2f423c3b28 100644 (file)
--- a/sound/soc/sof/sof-client-ipc-flood-test.c
+++ b/sound/soc/sof/sof-client-ipc-flood-test.c
@@ -223,7 +223,6 @@ static ssize_t sof_ipc_flood_dfs_write(struct file *file, const char __user *buf
        ret = sof_debug_ipc_flood_test(cdev, flood_duration_test,
                                       ipc_duration_ms, ipc_count);
 
-       pm_runtime_mark_last_busy(dev);
        err = pm_runtime_put_autosuspend(dev);
        if (err < 0)
                dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);

diff --git a/sound/soc/sof/sof-client-ipc-kernel-injector.c b/sound/soc/sof/sof-client-ipc-kernel-injector.c
index 8b28c3dc920cb0b02cb1d91b8492c51089add787..249bd2d6c8d28bedeb64862928b160cbd9ab7aef 100644 (file)
--- a/sound/soc/sof/sof-client-ipc-kernel-injector.c
+++ b/sound/soc/sof/sof-client-ipc-kernel-injector.c
@@ -65,7 +65,6 @@ static ssize_t sof_kernel_msg_inject_dfs_write(struct file *file, const char __u
 
        sof_client_ipc_rx_message(cdev, hdr, priv->kernel_buffer);
 
-       pm_runtime_mark_last_busy(dev);
        ret = pm_runtime_put_autosuspend(dev);
        if (ret < 0)
                dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", ret);

diff --git a/sound/soc/sof/sof-client-ipc-msg-injector.c b/sound/soc/sof/sof-client-ipc-msg-injector.c
index ba7ca1c5027ff0ad141d1cc6e024dd5fca346e05..9c8a0fbfb8dfebc26b9a316c912eecbe2b6fe27f 100644 (file)
--- a/sound/soc/sof/sof-client-ipc-msg-injector.c
+++ b/sound/soc/sof/sof-client-ipc-msg-injector.c
@@ -137,7 +137,6 @@ static int sof_msg_inject_send_message(struct sof_client_dev *cdev)
        if (ret)
                dev_err(dev, "IPC message send failed: %d\n", ret);
 
-       pm_runtime_mark_last_busy(dev);
        err = pm_runtime_put_autosuspend(dev);
        if (err < 0)
                dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);

diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c
index aff9ce9804295453ac955562e2550bb4913d9454..663c0d3c314c668507d133a171276e6260fef83b 100644 (file)
--- a/sound/soc/sof/sof-client-probes.c
+++ b/sound/soc/sof/sof-client-probes.c
@@ -238,7 +238,6 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to,
        kfree(desc);
 
 pm_error:
-       pm_runtime_mark_last_busy(dev);
        err = pm_runtime_put_autosuspend(dev);
        if (err < 0)
                dev_err_ratelimited(dev, "debugfs read failed to idle %d\n", err);
@@ -289,7 +288,6 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
        if (!ret)
                ret = count;
 
-       pm_runtime_mark_last_busy(dev);
        err = pm_runtime_put_autosuspend(dev);
        if (err < 0)
                dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
@@ -337,7 +335,6 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
        if (!ret)
                ret = count;
 
-       pm_runtime_mark_last_busy(dev);
        err = pm_runtime_put_autosuspend(dev);
        if (err < 0)
                dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);