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 <sakari.ailus@linux.intel.com>
Link: https://patch.msgid.link/20250704075457.3222746-1-sakari.ailus@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index 5d08f7d803f9d39c664aa658b41e54bdc1fd2796..c01b29616ebcb58712b267c5ac59989e68d04815 100644 (file)
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -259,7 +259,6 @@ int sst_pm_runtime_put(struct intel_sst_drv *sst_drv)
 {
        int ret;
 
-       pm_runtime_mark_last_busy(sst_drv->dev);
        ret = pm_runtime_put_autosuspend(sst_drv->dev);
        if (ret < 0)
                return ret;

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index ec1b3f55cb5c9decb6a82e3c9aa2d5760a1a224a..7af324753673598af9d697aa265b5fd18220df63 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -231,7 +231,6 @@ static void avs_hda_probe_work(struct work_struct *work)
        /* configure PM */
        pm_runtime_set_autosuspend_delay(bus->dev, 2000);
        pm_runtime_use_autosuspend(bus->dev);
-       pm_runtime_mark_last_busy(bus->dev);
        pm_runtime_put_autosuspend(bus->dev);
        pm_runtime_allow(bus->dev);
 }

diff --git a/sound/soc/intel/avs/debugfs.c b/sound/soc/intel/avs/debugfs.c
index c625cf879f170276a528938c1fa3a540c1f20dc3..f508f215ecd2b6170c6359f10091cb7446774f82 100644 (file)
--- a/sound/soc/intel/avs/debugfs.c
+++ b/sound/soc/intel/avs/debugfs.c
@@ -315,7 +315,6 @@ err_ipc:
        if (!adev->logged_resources) {
                avs_dsp_enable_d0ix(adev);
 err_d0ix:
-               pm_runtime_mark_last_busy(adev->dev);
                pm_runtime_put_autosuspend(adev->dev);
        }
 
@@ -342,7 +341,6 @@ static int disable_logs(struct avs_dev *adev, u32 resource_mask)
        /* If that's the last resource, allow for D3. */
        if (!adev->logged_resources) {
                avs_dsp_enable_d0ix(adev);
-               pm_runtime_mark_last_busy(adev->dev);
                pm_runtime_put_autosuspend(adev->dev);
        }
 

diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c
index 0314f9d4ea5f40084bef73c8e065bf1ffe60d087..6bfb9d1a1ca8185cf21c66ad09cb59a367c4257e 100644 (file)
--- a/sound/soc/intel/avs/ipc.c
+++ b/sound/soc/intel/avs/ipc.c
@@ -141,7 +141,6 @@ static void avs_dsp_recovery(struct avs_dev *adev)
        if (ret < 0)
                dev_err(adev->dev, "dsp reboot failed: %d\n", ret);
 
-       pm_runtime_mark_last_busy(adev->dev);
        pm_runtime_enable(adev->dev);
        pm_request_autosuspend(adev->dev);
 

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index ccf90428126d8ca674277ba471512633cd777195..3a22a8cb51858c8cd5a8c350082d206daa2fec8f 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -979,7 +979,6 @@ static int avs_component_load_libraries(struct avs_soc_component *acomp)
        if (!ret)
                ret = avs_module_info_init(adev, false);
 
-       pm_runtime_mark_last_busy(adev->dev);
        pm_runtime_put_autosuspend(adev->dev);
 
        return ret;

diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c
index 81a2f0339e0552851ac2aa218a1745e06e2c122c..46acb7fdc547d84efca7dc3ba785c3c061324601 100644 (file)
--- a/sound/soc/intel/catpt/pcm.c
+++ b/sound/soc/intel/catpt/pcm.c
@@ -673,7 +673,6 @@ static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm,
 
        ret = catpt_ipc_set_device_format(cdev, &devfmt);
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        if (ret)
@@ -871,7 +870,6 @@ static int catpt_mixer_volume_get(struct snd_kcontrol *kcontrol,
                ucontrol->value.integer.value[i] = dspvol_to_ctlvol(dspvol);
        }
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        return 0;
@@ -892,7 +890,6 @@ static int catpt_mixer_volume_put(struct snd_kcontrol *kcontrol,
        ret = catpt_set_dspvol(cdev, cdev->mixer.mixer_hw_id,
                               ucontrol->value.integer.value);
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        return ret;
@@ -927,7 +924,6 @@ static int catpt_stream_volume_get(struct snd_kcontrol *kcontrol,
                ucontrol->value.integer.value[i] = dspvol_to_ctlvol(dspvol);
        }
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        return 0;
@@ -958,7 +954,6 @@ static int catpt_stream_volume_put(struct snd_kcontrol *kcontrol,
        ret = catpt_set_dspvol(cdev, stream->info.stream_hw_id,
                               ucontrol->value.integer.value);
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        if (ret)
@@ -1035,7 +1030,6 @@ static int catpt_loopback_switch_put(struct snd_kcontrol *kcontrol,
 
        ret = catpt_ipc_mute_loopback(cdev, stream->info.stream_hw_id, mute);
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        if (ret)

diff --git a/sound/soc/intel/catpt/sysfs.c b/sound/soc/intel/catpt/sysfs.c
index 936ac9d503ff30f8c0fcc747ae082d1213ece358..048253002ec87cf5db107d8ca48ace1355907681 100644 (file)
--- a/sound/soc/intel/catpt/sysfs.c
+++ b/sound/soc/intel/catpt/sysfs.c
@@ -21,7 +21,6 @@ static ssize_t fw_version_show(struct device *dev,
 
        ret = catpt_ipc_get_fw_version(cdev, &version);
 
-       pm_runtime_mark_last_busy(cdev->dev);
        pm_runtime_put_autosuspend(cdev->dev);
 
        if (ret)