mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 01:53:29 +02:00
ASoC: soc-dapm: remove suspend_bias_off from snd_soc_dapm_context
We can directly use suspend_bias_off via snd_soc_component, no need to keep it on dapm. Remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/875xdyx06e.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
e38a80c5c2
commit
3bc0a92cb2
|
|
@ -585,7 +585,6 @@ struct snd_soc_dapm_context {
|
|||
|
||||
/* bit field */
|
||||
unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
|
||||
unsigned int suspend_bias_off:1; /* Use BIAS_OFF in suspend if the DAPM is idle */
|
||||
|
||||
struct device *dev; /* from parent - for debug */ /* REMOVE ME */
|
||||
struct snd_soc_component *component; /* parent component */
|
||||
|
|
|
|||
|
|
@ -2182,13 +2182,16 @@ static void dapm_power_one_widget(struct snd_soc_dapm_widget *w,
|
|||
|
||||
static bool dapm_idle_bias_off(struct snd_soc_dapm_context *dapm)
|
||||
{
|
||||
struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
|
||||
if (dapm->idle_bias_off)
|
||||
return true;
|
||||
|
||||
switch (snd_power_get_state(dapm->card->snd_card)) {
|
||||
case SNDRV_CTL_POWER_D3hot:
|
||||
case SNDRV_CTL_POWER_D3cold:
|
||||
return dapm->suspend_bias_off;
|
||||
if (component)
|
||||
return component->driver->suspend_bias_off;
|
||||
fallthrough;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -4823,7 +4826,6 @@ void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,
|
|||
if (component) {
|
||||
dapm->dev = component->dev;
|
||||
dapm->idle_bias_off = !component->driver->idle_bias_on;
|
||||
dapm->suspend_bias_off = component->driver->suspend_bias_off;
|
||||
} else {
|
||||
dapm->dev = card->dev;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user