Skip to content

Commit 2bd9648

Browse files
Sakari Ailusbroonie
authored andcommitted
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 <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent e879f14 commit 2bd9648

File tree

9 files changed

+0
-11
lines changed

9 files changed

+0
-11
lines changed

sound/soc/sof/control.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _
196196
if (tplg_ops && tplg_ops->control && tplg_ops->control->bytes_ext_volatile_get)
197197
ret = tplg_ops->control->bytes_ext_volatile_get(scontrol, binary_data, size);
198198

199-
pm_runtime_mark_last_busy(scomp->dev);
200199
err = pm_runtime_put_autosuspend(scomp->dev);
201200
if (err < 0)
202201
dev_err_ratelimited(scomp->dev, "%s: failed to idle %d\n", __func__, err);

sound/soc/sof/debug.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ static int memory_info_update(struct snd_sof_dev *sdev, char *buf, size_t buff_s
217217
}
218218

219219
ret = sof_ipc_tx_message(sdev->ipc, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);
220-
pm_runtime_mark_last_busy(sdev->dev);
221220
pm_runtime_put_autosuspend(sdev->dev);
222221
if (ret < 0 || reply->rhdr.error < 0) {
223222
ret = min(ret, reply->rhdr.error);

sound/soc/sof/ipc3-dtrace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ static int ipc3_trace_update_filter(struct snd_sof_dev *sdev, int num_elems,
172172
goto error;
173173
}
174174
ret = sof_ipc_tx_message_no_reply(sdev->ipc, msg, msg->hdr.size);
175-
pm_runtime_mark_last_busy(sdev->dev);
176175
pm_runtime_put_autosuspend(sdev->dev);
177176

178177
error:

sound/soc/sof/ipc4-loader.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ static int sof_ipc4_load_library(struct snd_sof_dev *sdev, unsigned long lib_id,
236236

237237
ret = ipc4_data->load_library(sdev, fw_lib, false);
238238

239-
pm_runtime_mark_last_busy(sdev->dev);
240239
err = pm_runtime_put_autosuspend(sdev->dev);
241240
if (err < 0)
242241
dev_err_ratelimited(sdev->dev, "%s: pm_runtime idle failed: %d\n",

sound/soc/sof/pcm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,6 @@ static int sof_pcm_probe(struct snd_soc_component *component)
728728
ret);
729729

730730
pm_error:
731-
pm_runtime_mark_last_busy(component->dev);
732731
pm_runtime_put_autosuspend(component->dev);
733732

734733
return ret;

sound/soc/sof/sof-client-ipc-flood-test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ static ssize_t sof_ipc_flood_dfs_write(struct file *file, const char __user *buf
223223
ret = sof_debug_ipc_flood_test(cdev, flood_duration_test,
224224
ipc_duration_ms, ipc_count);
225225

226-
pm_runtime_mark_last_busy(dev);
227226
err = pm_runtime_put_autosuspend(dev);
228227
if (err < 0)
229228
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ static ssize_t sof_kernel_msg_inject_dfs_write(struct file *file, const char __u
6565

6666
sof_client_ipc_rx_message(cdev, hdr, priv->kernel_buffer);
6767

68-
pm_runtime_mark_last_busy(dev);
6968
ret = pm_runtime_put_autosuspend(dev);
7069
if (ret < 0)
7170
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", ret);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ static int sof_msg_inject_send_message(struct sof_client_dev *cdev)
137137
if (ret)
138138
dev_err(dev, "IPC message send failed: %d\n", ret);
139139

140-
pm_runtime_mark_last_busy(dev);
141140
err = pm_runtime_put_autosuspend(dev);
142141
if (err < 0)
143142
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);

sound/soc/sof/sof-client-probes.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to,
238238
kfree(desc);
239239

240240
pm_error:
241-
pm_runtime_mark_last_busy(dev);
242241
err = pm_runtime_put_autosuspend(dev);
243242
if (err < 0)
244243
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,
289288
if (!ret)
290289
ret = count;
291290

292-
pm_runtime_mark_last_busy(dev);
293291
err = pm_runtime_put_autosuspend(dev);
294292
if (err < 0)
295293
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,
337335
if (!ret)
338336
ret = count;
339337

340-
pm_runtime_mark_last_busy(dev);
341338
err = pm_runtime_put_autosuspend(dev);
342339
if (err < 0)
343340
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);

0 commit comments

Comments
 (0)