Skip to content

Commit 077e700

Browse files
Sakari Ailusbroonie
authored andcommitted
ASoC: Intel: 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]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent bbe5e3c commit 077e700

File tree

7 files changed

+0
-13
lines changed

7 files changed

+0
-13
lines changed

sound/soc/intel/atom/sst/sst_pvt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ int sst_pm_runtime_put(struct intel_sst_drv *sst_drv)
259259
{
260260
int ret;
261261

262-
pm_runtime_mark_last_busy(sst_drv->dev);
263262
ret = pm_runtime_put_autosuspend(sst_drv->dev);
264263
if (ret < 0)
265264
return ret;

sound/soc/intel/avs/core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ static void avs_hda_probe_work(struct work_struct *work)
231231
/* configure PM */
232232
pm_runtime_set_autosuspend_delay(bus->dev, 2000);
233233
pm_runtime_use_autosuspend(bus->dev);
234-
pm_runtime_mark_last_busy(bus->dev);
235234
pm_runtime_put_autosuspend(bus->dev);
236235
pm_runtime_allow(bus->dev);
237236
}

sound/soc/intel/avs/debugfs.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ static int enable_logs(struct avs_dev *adev, u32 resource_mask, u32 *priorities)
315315
if (!adev->logged_resources) {
316316
avs_dsp_enable_d0ix(adev);
317317
err_d0ix:
318-
pm_runtime_mark_last_busy(adev->dev);
319318
pm_runtime_put_autosuspend(adev->dev);
320319
}
321320

@@ -342,7 +341,6 @@ static int disable_logs(struct avs_dev *adev, u32 resource_mask)
342341
/* If that's the last resource, allow for D3. */
343342
if (!adev->logged_resources) {
344343
avs_dsp_enable_d0ix(adev);
345-
pm_runtime_mark_last_busy(adev->dev);
346344
pm_runtime_put_autosuspend(adev->dev);
347345
}
348346

sound/soc/intel/avs/ipc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ static void avs_dsp_recovery(struct avs_dev *adev)
141141
if (ret < 0)
142142
dev_err(adev->dev, "dsp reboot failed: %d\n", ret);
143143

144-
pm_runtime_mark_last_busy(adev->dev);
145144
pm_runtime_enable(adev->dev);
146145
pm_request_autosuspend(adev->dev);
147146

sound/soc/intel/avs/pcm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,6 @@ static int avs_component_load_libraries(struct avs_soc_component *acomp)
979979
if (!ret)
980980
ret = avs_module_info_init(adev, false);
981981

982-
pm_runtime_mark_last_busy(adev->dev);
983982
pm_runtime_put_autosuspend(adev->dev);
984983

985984
return ret;

sound/soc/intel/catpt/pcm.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,6 @@ static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm,
673673

674674
ret = catpt_ipc_set_device_format(cdev, &devfmt);
675675

676-
pm_runtime_mark_last_busy(cdev->dev);
677676
pm_runtime_put_autosuspend(cdev->dev);
678677

679678
if (ret)
@@ -871,7 +870,6 @@ static int catpt_mixer_volume_get(struct snd_kcontrol *kcontrol,
871870
ucontrol->value.integer.value[i] = dspvol_to_ctlvol(dspvol);
872871
}
873872

874-
pm_runtime_mark_last_busy(cdev->dev);
875873
pm_runtime_put_autosuspend(cdev->dev);
876874

877875
return 0;
@@ -892,7 +890,6 @@ static int catpt_mixer_volume_put(struct snd_kcontrol *kcontrol,
892890
ret = catpt_set_dspvol(cdev, cdev->mixer.mixer_hw_id,
893891
ucontrol->value.integer.value);
894892

895-
pm_runtime_mark_last_busy(cdev->dev);
896893
pm_runtime_put_autosuspend(cdev->dev);
897894

898895
return ret;
@@ -927,7 +924,6 @@ static int catpt_stream_volume_get(struct snd_kcontrol *kcontrol,
927924
ucontrol->value.integer.value[i] = dspvol_to_ctlvol(dspvol);
928925
}
929926

930-
pm_runtime_mark_last_busy(cdev->dev);
931927
pm_runtime_put_autosuspend(cdev->dev);
932928

933929
return 0;
@@ -958,7 +954,6 @@ static int catpt_stream_volume_put(struct snd_kcontrol *kcontrol,
958954
ret = catpt_set_dspvol(cdev, stream->info.stream_hw_id,
959955
ucontrol->value.integer.value);
960956

961-
pm_runtime_mark_last_busy(cdev->dev);
962957
pm_runtime_put_autosuspend(cdev->dev);
963958

964959
if (ret)
@@ -1035,7 +1030,6 @@ static int catpt_loopback_switch_put(struct snd_kcontrol *kcontrol,
10351030

10361031
ret = catpt_ipc_mute_loopback(cdev, stream->info.stream_hw_id, mute);
10371032

1038-
pm_runtime_mark_last_busy(cdev->dev);
10391033
pm_runtime_put_autosuspend(cdev->dev);
10401034

10411035
if (ret)

sound/soc/intel/catpt/sysfs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ static ssize_t fw_version_show(struct device *dev,
2121

2222
ret = catpt_ipc_get_fw_version(cdev, &version);
2323

24-
pm_runtime_mark_last_busy(cdev->dev);
2524
pm_runtime_put_autosuspend(cdev->dev);
2625

2726
if (ret)

0 commit comments

Comments
 (0)