ASoC: Remove unused DAPM suspend flag
We now manage suspend within the main power analysis rather than by flipping the state of widgets. Tested-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Родитель
29e189c29d
Коммит
50ae8384cd
|
@ -427,7 +427,6 @@ struct snd_soc_dapm_widget {
|
||||||
unsigned char connected:1; /* connected codec pin */
|
unsigned char connected:1; /* connected codec pin */
|
||||||
unsigned char new:1; /* cnew complete */
|
unsigned char new:1; /* cnew complete */
|
||||||
unsigned char ext:1; /* has external widgets */
|
unsigned char ext:1; /* has external widgets */
|
||||||
unsigned char suspend:1; /* was active before suspend */
|
|
||||||
unsigned char force:1; /* force state */
|
unsigned char force:1; /* force state */
|
||||||
|
|
||||||
int (*power_check)(struct snd_soc_dapm_widget *w);
|
int (*power_check)(struct snd_soc_dapm_widget *w);
|
||||||
|
|
|
@ -2012,18 +2012,8 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
|
||||||
w->active = 0;
|
w->active = 0;
|
||||||
break;
|
break;
|
||||||
case SND_SOC_DAPM_STREAM_SUSPEND:
|
case SND_SOC_DAPM_STREAM_SUSPEND:
|
||||||
if (w->active)
|
|
||||||
w->suspend = 1;
|
|
||||||
w->active = 0;
|
|
||||||
break;
|
|
||||||
case SND_SOC_DAPM_STREAM_RESUME:
|
case SND_SOC_DAPM_STREAM_RESUME:
|
||||||
if (w->suspend) {
|
|
||||||
w->active = 1;
|
|
||||||
w->suspend = 0;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
|
case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
|
||||||
break;
|
|
||||||
case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
|
case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче