Commit 35c64bca authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Ensure all DAPM widgets have a power check callback 



Makes the code simpler.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f9de6d74

sound/soc/soc-dapm.c

+8 −3
Original line number Diff line number Diff line
@@ -857,6 +857,11 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) 
	return power;

}



static int dapm_always_on_check_power(struct snd_soc_dapm_widget *w)

{

	return 1;

}



static int dapm_seq_compare(struct snd_soc_dapm_widget *a,

			    struct snd_soc_dapm_widget *b,

			    bool power_up)
@@ -1229,9 +1234,6 @@ static void dapm_power_one_widget(struct snd_soc_dapm_widget *w, 
		break;



	default:

		if (!w->power_check)

			break;



		if (!w->force)

			power = w->power_check(w);

		else
@@ -2090,6 +2092,9 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) 
			break;

		}



		if (!w->power_check)

			w->power_check = dapm_always_on_check_power;



		/* Read the initial power state from the device */

		if (w->reg >= 0) {

			val = soc_widget_read(w, w->reg);