]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: codecs: Remove redundant pm_runtime_mark_last_busy() calls
authorSakari Ailus <sakari.ailus@linux.intel.com>
Fri, 4 Jul 2025 07:54:56 +0000 (10:54 +0300)
committerMark Brown <broonie@kernel.org>
Fri, 4 Jul 2025 18:28:19 +0000 (19:28 +0100)
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/20250704075456.3222642-1-sakari.ailus@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
33 files changed:
sound/soc/codecs/arizona-jack.c
sound/soc/codecs/cs35l41.c
sound/soc/codecs/cs35l45.c
sound/soc/codecs/cs35l56-sdw.c
sound/soc/codecs/cs35l56.c
sound/soc/codecs/cs42l42.c
sound/soc/codecs/cs42l43-jack.c
sound/soc/codecs/cs42l43.c
sound/soc/codecs/cs48l32.c
sound/soc/codecs/hda.c
sound/soc/codecs/max98363.c
sound/soc/codecs/max98373-sdw.c
sound/soc/codecs/rt1017-sdca-sdw.c
sound/soc/codecs/rt1308-sdw.c
sound/soc/codecs/rt1316-sdw.c
sound/soc/codecs/rt1318-sdw.c
sound/soc/codecs/rt1320-sdw.c
sound/soc/codecs/rt5682-sdw.c
sound/soc/codecs/rt700.c
sound/soc/codecs/rt711-sdca.c
sound/soc/codecs/rt711.c
sound/soc/codecs/rt712-sdca-dmic.c
sound/soc/codecs/rt712-sdca.c
sound/soc/codecs/rt715-sdca.c
sound/soc/codecs/rt715.c
sound/soc/codecs/rt721-sdca.c
sound/soc/codecs/rt722-sdca.c
sound/soc/codecs/rt9123.c
sound/soc/codecs/tas2552.c
sound/soc/codecs/wcd-mbhc-v2.c
sound/soc/codecs/wsa881x.c
sound/soc/codecs/wsa883x.c
sound/soc/codecs/wsa884x.c

index 9c15ddba6008c6cb965182fcad907ed13219c8e7..22f9c431a0e550218bbcd1c4e6d62f01b079e413 100644 (file)
@@ -319,7 +319,6 @@ static void arizona_stop_mic(struct arizona_priv *info)
 
        if (change) {
                regulator_disable(info->micvdd);
-               pm_runtime_mark_last_busy(arizona->dev);
                pm_runtime_put_autosuspend(arizona->dev);
        }
 }
@@ -1127,7 +1126,6 @@ out:
 
        mutex_unlock(&info->lock);
 
-       pm_runtime_mark_last_busy(arizona->dev);
        pm_runtime_put_autosuspend(arizona->dev);
 
        return IRQ_HANDLED;
index ff4134bee858eda7d36839df17a7936eecc4d2bf..224d65987a8df386f29b1c8d41371e6b1ea6ae1b 100644 (file)
@@ -483,7 +483,6 @@ static irqreturn_t cs35l41_irq(int irq, void *data)
        }
 
 done:
-       pm_runtime_mark_last_busy(cs35l41->dev);
        pm_runtime_put_autosuspend(cs35l41->dev);
 
        return ret;
@@ -1328,7 +1327,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
 
        pm_runtime_set_autosuspend_delay(cs35l41->dev, 3000);
        pm_runtime_use_autosuspend(cs35l41->dev);
-       pm_runtime_mark_last_busy(cs35l41->dev);
        pm_runtime_set_active(cs35l41->dev);
        pm_runtime_get_noresume(cs35l41->dev);
        pm_runtime_enable(cs35l41->dev);
index 432a19f4de2b4b64d99419bece01d4e15f7bab3c..d4dcdf37bb709ab2c1f5bb1fe9b3d5a86fa3ffda 100644 (file)
@@ -1427,7 +1427,6 @@ int cs35l45_probe(struct cs35l45_private *cs35l45)
 
        pm_runtime_set_autosuspend_delay(cs35l45->dev, 3000);
        pm_runtime_use_autosuspend(cs35l45->dev);
-       pm_runtime_mark_last_busy(cs35l45->dev);
        pm_runtime_set_active(cs35l45->dev);
        pm_runtime_get_noresume(cs35l45->dev);
        pm_runtime_enable(cs35l45->dev);
index 13f602f51bf327df0dab1b10f503b629dfd31195..2c722a0ea85268abfa179967b721a89f5e14fb32 100644 (file)
@@ -282,7 +282,6 @@ static void cs35l56_sdw_init(struct sdw_slave *peripheral)
        }
 
 out:
-       pm_runtime_mark_last_busy(cs35l56->base.dev);
        pm_runtime_put_autosuspend(cs35l56->base.dev);
 }
 
index c78e4746e428704e09c8b8470c87869ebde95517..c6658dcc6dd1a3b7477dd9e90f994fd8ab2c5786 100644 (file)
@@ -849,7 +849,6 @@ static void cs35l56_dsp_work(struct work_struct *work)
 
        cs35l56_log_tuning(&cs35l56->base, &cs35l56->dsp.cs_dsp);
 err:
-       pm_runtime_mark_last_busy(cs35l56->base.dev);
        pm_runtime_put_autosuspend(cs35l56->base.dev);
 }
 
index 56668c39206394eadd443a7115d8aa188d9c5b91..78bb093fa0cc0d07206a0a092072b9a1ebf936dc 100644 (file)
@@ -1775,7 +1775,6 @@ irqreturn_t cs42l42_irq_thread(int irq, void *data)
        }
 
        mutex_unlock(&cs42l42->irq_lock);
-       pm_runtime_mark_last_busy(cs42l42->dev);
        pm_runtime_put_autosuspend(cs42l42->dev);
 
        return IRQ_HANDLED;
index 6165ac16c3a950aa10666e026a889570e90fe2ee..f5c5150c25e523c828292af9144d73b40d8e6ffa 100644 (file)
@@ -242,7 +242,6 @@ done:
 error:
        mutex_unlock(&priv->jack_lock);
 
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 
        return ret;
@@ -423,7 +422,6 @@ void cs42l43_button_press_work(struct work_struct *work)
 error:
        mutex_unlock(&priv->jack_lock);
 
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 }
 
@@ -462,7 +460,6 @@ void cs42l43_button_release_work(struct work_struct *work)
 
        mutex_unlock(&priv->jack_lock);
 
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 }
 
@@ -504,7 +501,6 @@ void cs42l43_bias_sense_timeout(struct work_struct *work)
 
        mutex_unlock(&priv->jack_lock);
 
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 }
 
@@ -776,7 +772,6 @@ error:
 
        priv->suspend_jack_debounce = false;
 
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 }
 
index ea84ac64c775e4b1c2cc2d85d9aea0043cd73950..d84ad8d4343801354bc1c17fc7aaa3f83a9b3faf 100644 (file)
@@ -1088,7 +1088,6 @@ static int cs42l43_shutter_get(struct cs42l43_codec *priv, unsigned int shift)
                ret ? "open" : "closed");
 
 error:
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 
        return ret;
@@ -2370,7 +2369,6 @@ static int cs42l43_codec_probe(struct platform_device *pdev)
                goto err_clk;
        }
 
-       pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 
        return 0;
index 90a795230d276e10269f951a43b44ec86410ca7d..6503f04cf8bb1cba9a965deee68cdf19a6ce143c 100644 (file)
@@ -1385,7 +1385,6 @@ static irqreturn_t cs48l32_irq(int irq, void *data)
        result = IRQ_HANDLED;
 
 out:
-       pm_runtime_mark_last_busy(cs48l32_codec->core.dev);
        pm_runtime_put_autosuspend(cs48l32_codec->core.dev);
 
        return result;
index dc7794c9ac44cedc43b4d37e2661ab6c10d8cade..7e4df14814860260d8c75af69dab980dfe6f6de1 100644 (file)
@@ -162,7 +162,6 @@ int hda_codec_probe_complete(struct hda_codec *codec)
        snd_hda_codec_register(codec);
 
        /* Complement pm_runtime_get_sync(bus) in probe */
-       pm_runtime_mark_last_busy(bus->dev);
        pm_runtime_put_autosuspend(bus->dev);
 
        return ret;
@@ -262,7 +261,6 @@ device_new_err:
 
        snd_hdac_ext_bus_link_put(bus, hlink);
 
-       pm_runtime_mark_last_busy(bus->dev);
        pm_runtime_put_autosuspend(bus->dev);
        return ret;
 }
@@ -300,7 +298,6 @@ static void hda_codec_remove(struct snd_soc_component *component)
         * not be called due to early error, leaving bus uc unbalanced
         */
        if (!was_registered) {
-               pm_runtime_mark_last_busy(bus->dev);
                pm_runtime_put_autosuspend(bus->dev);
        }
 
index 950105e5bffdc2c7606e10e7af6f3cf97ece5b4c..575331e4bc4697332aeec19369b4246d805995cc 100644 (file)
@@ -188,7 +188,6 @@ static int max98363_io_init(struct sdw_slave *slave)
        max98363->hw_init = true;
 
 out:
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;
index 6088278e6503dc7ea743ccc439cd6365c7475017..143c0384ba0f8ae22c7a71c3a167a1ca700385eb 100644 (file)
@@ -458,7 +458,6 @@ static int max98373_io_init(struct sdw_slave *slave)
        max98373->first_hw_init = true;
        max98373->hw_init = true;
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return 0;
index 88fc23a4999fbc9a24c07f6b8272235d9fe9947d..a9c000876be8b63612598cc125711ccc4be7399d 100644 (file)
@@ -362,7 +362,6 @@ static int rt1017_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt1017->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "hw_init complete\n");
index ea708068f0e8eda613d468417b9c3414a0d52a45..b6c224832a4311439aa8fb6546a9e37689864fdc 100644 (file)
@@ -291,7 +291,6 @@ _preset_ready_:
        /* Mark Slave initialization complete */
        rt1308->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 960b6c4f5a6680bb1f45a416b373b5e900a81eb1..01a9773988646486c15d9d8c6062dbe7fbe74b3d 100644 (file)
@@ -302,7 +302,6 @@ static int rt1316_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt1316->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 4eb636e0c9ed1c8c9f1ee8f5d38d656378cff926..70db5450d6d293f67fade4a0145ec6fe017ffcc1 100644 (file)
@@ -434,7 +434,6 @@ static int rt1318_io_init(struct device *dev, struct sdw_slave *slave)
        rt1318->first_hw_init = true;
        rt1318->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 015cc710e6dc08ae5e9b7a9ef765cdee15cd4f5e..b13d7a99bf63a836f1425d9512d70b4e822dd78f 100644 (file)
@@ -763,7 +763,6 @@ static int rt1320_io_init(struct device *dev, struct sdw_slave *slave)
        rt1320->first_hw_init = true;
        rt1320->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index aa229894129bfddbf4533c97646eda8cdc474ccb..055bea0a4a3ba4207697e59ca13475b092f029d6 100644 (file)
@@ -474,7 +474,6 @@ reinit:
        rt5682->first_hw_init = true;
 
 err_nodev:
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete: %d\n", __func__, ret);
index 434b926f96c8376c1c5b8b73c37b01b2d64641fe..8f6d569c8f25d0c3313c8290331359625cab0960 100644 (file)
@@ -338,7 +338,6 @@ static int rt700_set_jack_detect(struct snd_soc_component *component,
 
        rt700_jack_init(rt700);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1230,7 +1229,6 @@ int rt700_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt700->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index dd6ccf17afd4399f1fe0c505d92517048279d6a7..16c351779243409e2eed5a252acdb50f1a6555ae 100644 (file)
@@ -545,7 +545,6 @@ static int rt711_sdca_set_jack_detect(struct snd_soc_component *component,
 
        rt711_sdca_jack_init(rt711);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1662,7 +1661,6 @@ int rt711_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt711->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 5446f9506a16722e8a43571631d109fa27c9fe65..af3a49aee618a9df1e834b8c8aebeb1920783188 100644 (file)
@@ -480,7 +480,6 @@ static int rt711_set_jack_detect(struct snd_soc_component *component,
 
        rt711_jack_init(rt711);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1331,7 +1330,6 @@ int rt711_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt711->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 4d044dfa3136e50042e1c573253eee5b12f137d1..42f8f7b8bed087731fa0ae972c3d7ccf8dafed88 100644 (file)
@@ -236,7 +236,6 @@ static int rt712_sdca_dmic_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt712->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 570c2af1245d64d092fd05d2febb8307fe750de8..5b298db5f0f611e41c24e2071934eb9e6357826b 100644 (file)
@@ -479,7 +479,6 @@ static int rt712_sdca_set_jack_detect(struct snd_soc_component *component,
 
        rt712_sdca_jack_init(rt712);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1925,7 +1924,6 @@ int rt712_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
 
 suspend:
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        return 0;
index 7fb02654c16bd992ee1299c68de981f22d633626..db7d43349d7da33bffcd9124733c6ef3cbcd501a 100644 (file)
@@ -1065,7 +1065,6 @@ int rt715_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt715->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        return 0;
index 2cf4618520918bb16d4d43a0ac8516d8b6c04173..0fa445d88e232fda1a39789571768240dde621f5 100644 (file)
@@ -1129,7 +1129,6 @@ int rt715_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt715->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        return 0;
index 1c9f32e405cf95f7e5d9a3aef7e68fdd9b294f7b..2949e3d5904999b21ddbe059330437de9b5b3924 100644 (file)
@@ -327,7 +327,6 @@ static int rt721_sdca_set_jack_detect(struct snd_soc_component *component,
 
        rt721_sdca_jack_init(rt721);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1533,7 +1532,6 @@ int rt721_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt721->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index ac9588284a955cccf16044fac699bdb343702908..333611490ae3583275ba087a70545d7d08ced10a 100644 (file)
@@ -339,7 +339,6 @@ static int rt722_sdca_set_jack_detect(struct snd_soc_component *component,
 
        rt722_sdca_jack_init(rt722);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1559,7 +1558,6 @@ int rt722_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        /* Mark Slave initialization complete */
        rt722->hw_init = true;
 
-       pm_runtime_mark_last_busy(&slave->dev);
        pm_runtime_put_autosuspend(&slave->dev);
 
        dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
index 242e8c975a62168085397dec025be70839c51d72..b162824526d6b226683304f0d169d4676b148595 100644 (file)
@@ -77,7 +77,6 @@ static int rt9123_enable_event(struct snd_soc_dapm_widget *w, struct snd_kcontro
        /* AMPON bit is located in volatile RG, use pm_runtime to guarantee the RG access */
        snd_soc_component_write_field(comp, RT9123_REG_AMPCTRL, RT9123_MASK_AMPON, enable);
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return 0;
@@ -140,7 +139,6 @@ static int rt9123_xhandler_get(struct snd_kcontrol *kcontrol, struct snd_ctl_ele
        if (ret < 0)
                dev_err(dev, "Failed to get control (%d)\n", ret);
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        return ret;
 }
@@ -168,7 +166,6 @@ static int rt9123_xhandler_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ele
        if (ret < 0)
                dev_err(dev, "Failed to put control (%d)\n", ret);
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        return ret;
 }
index b56dd279d90acacd9665e574d9660ea6102ddb67..43449d7c25843016b0b18a7f9e9c1e61b77ee839 100644 (file)
@@ -724,7 +724,6 @@ static int tas2552_probe(struct i2c_client *client)
        pm_runtime_set_autosuspend_delay(&client->dev, 1000);
        pm_runtime_use_autosuspend(&client->dev);
        pm_runtime_enable(&client->dev);
-       pm_runtime_mark_last_busy(&client->dev);
        pm_runtime_put_sync_autosuspend(&client->dev);
 
        dev_set_drvdata(&client->dev, data);
index 4b7c3d6080a1090d0a3b8f90116c2e2f90a99c13..26ebcdadeb7dab19f132dc2e3dc843c895d7d4ed 100644 (file)
@@ -825,7 +825,6 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc)
 
        mutex_unlock(&mbhc->lock);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 
        return 0;
@@ -1319,7 +1318,6 @@ exit:
        if (mbhc->mbhc_cb->hph_pull_down_ctrl)
                mbhc->mbhc_cb->hph_pull_down_ctrl(component, true);
 
-       pm_runtime_mark_last_busy(component->dev);
        pm_runtime_put_autosuspend(component->dev);
 }
 
index 6627d2da372206eff879f8f3bd5fae9ddc0757d7..11e9b97754d4f6486e92a3a41555e337f1c388a1 100644 (file)
@@ -775,7 +775,6 @@ static int wsa881x_put_pa_gain(struct snd_kcontrol *kc,
                usleep_range(1000, 1010);
        }
 
-       pm_runtime_mark_last_busy(comp->dev);
        pm_runtime_put_autosuspend(comp->dev);
 
        return 1;
index f04d99c66f332e18fe4c201f78360416c1607466..12eaf21774f3609d07c207813a4df7215d5ded5d 100644 (file)
@@ -1491,7 +1491,6 @@ static int wsa883x_get_temp(struct wsa883x_priv *wsa883x, long *temp)
                ret = -EAGAIN;
        }
 out:
-       pm_runtime_mark_last_busy(wsa883x->dev);
        pm_runtime_put_autosuspend(wsa883x->dev);
 
        return ret;
index fd6ebc25fe894a5981df4e39d10d0f27d21c3a25..415c9df9bb16c3efc87b30ef9a6c1ffd5e3e67c1 100644 (file)
@@ -1941,7 +1941,6 @@ static int wsa884x_get_temp(struct wsa884x_priv *wsa884x, long *temp)
        }
 
 out:
-       pm_runtime_mark_last_busy(wsa884x->dev);
        pm_runtime_put_autosuspend(wsa884x->dev);
 
        return ret;