mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 15:13:55 +08:00
ASoC: Make DAPM power sequence lists local variables
They are now only accessed within dapm_power_widgets() so can be local to that function. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
4f1c192385
commit
291f3bbcac
@ -369,8 +369,6 @@ struct snd_soc_codec {
|
||||
enum snd_soc_bias_level bias_level;
|
||||
enum snd_soc_bias_level suspend_bias_level;
|
||||
struct delayed_work delayed_work;
|
||||
struct list_head up_list;
|
||||
struct list_head down_list;
|
||||
|
||||
/* codec DAI's */
|
||||
struct snd_soc_dai *dai;
|
||||
|
@ -927,23 +927,22 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
|
||||
{
|
||||
struct snd_soc_device *socdev = codec->socdev;
|
||||
struct snd_soc_dapm_widget *w;
|
||||
LIST_HEAD(up_list);
|
||||
LIST_HEAD(down_list);
|
||||
int ret = 0;
|
||||
int power;
|
||||
int sys_power = 0;
|
||||
|
||||
INIT_LIST_HEAD(&codec->up_list);
|
||||
INIT_LIST_HEAD(&codec->down_list);
|
||||
|
||||
/* Check which widgets we need to power and store them in
|
||||
* lists indicating if they should be powered up or down.
|
||||
*/
|
||||
list_for_each_entry(w, &codec->dapm_widgets, list) {
|
||||
switch (w->id) {
|
||||
case snd_soc_dapm_pre:
|
||||
dapm_seq_insert(w, &codec->down_list, dapm_down_seq);
|
||||
dapm_seq_insert(w, &down_list, dapm_down_seq);
|
||||
break;
|
||||
case snd_soc_dapm_post:
|
||||
dapm_seq_insert(w, &codec->up_list, dapm_up_seq);
|
||||
dapm_seq_insert(w, &up_list, dapm_up_seq);
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -958,11 +957,9 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
|
||||
continue;
|
||||
|
||||
if (power)
|
||||
dapm_seq_insert(w, &codec->up_list,
|
||||
dapm_up_seq);
|
||||
dapm_seq_insert(w, &up_list, dapm_up_seq);
|
||||
else
|
||||
dapm_seq_insert(w, &codec->down_list,
|
||||
dapm_down_seq);
|
||||
dapm_seq_insert(w, &down_list, dapm_down_seq);
|
||||
|
||||
w->power = power;
|
||||
break;
|
||||
@ -979,10 +976,10 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
|
||||
}
|
||||
|
||||
/* Power down widgets first; try to avoid amplifying pops. */
|
||||
dapm_seq_run(codec, &codec->down_list, event, dapm_down_seq);
|
||||
dapm_seq_run(codec, &down_list, event, dapm_down_seq);
|
||||
|
||||
/* Now power up. */
|
||||
dapm_seq_run(codec, &codec->up_list, event, dapm_up_seq);
|
||||
dapm_seq_run(codec, &up_list, event, dapm_up_seq);
|
||||
|
||||
/* If we just powered the last thing off drop to standby bias */
|
||||
if (codec->bias_level == SND_SOC_BIAS_PREPARE && !sys_power) {
|
||||
|
Loading…
Reference in New Issue
Block a user