mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 03:44:45 +01:00
ASoC: codecs: 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/20250704075456.3222642-1-sakari.ailus@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
9069141d1d
commit
bbe5e3c433
33 changed files with 0 additions and 51 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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__);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue