Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2927d6ee authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai
Browse files

ALSA: ASoC: Refactor DAPM event handler 



The DAPM event callback code has many layers of indentation, taking it
over 80 columns. Refactor the code to give less indentation in order to
avoid checkpatch issues on further changes and exploding indentation.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 462dba28

sound/soc/soc-dapm.c

+41 −38
Original line number Diff line number Diff line
@@ -586,47 +586,50 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 
			power_change = (w->power == power) ? 0: 1;

			w->power = power;



			if (!power_change)

				continue;



			/* call any power change event handlers */

			if (power_change) {

				if (w->event) {

			if (w->event)

				pr_debug("power %s event for %s flags %x\n",

						 w->power ? "on" : "off", w->name, w->event_flags);

					if (power) {

						/* power up event */

						if (w->event_flags & SND_SOC_DAPM_PRE_PMU) {

							ret = w->event(w,

								NULL, SND_SOC_DAPM_PRE_PMU);

					 w->power ? "on" : "off",

					 w->name, w->event_flags);



			/* power up pre event */

			if (power && w->event &&

			    (w->event_flags & SND_SOC_DAPM_PRE_PMU)) {

				ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU);

				if (ret < 0)

					return ret;

			}

						dapm_update_bits(w);

						if (w->event_flags & SND_SOC_DAPM_POST_PMU){

							ret = w->event(w,

								NULL, SND_SOC_DAPM_POST_PMU);



			/* power down pre event */

			if (!power && w->event &&

			    (w->event_flags & SND_SOC_DAPM_PRE_PMD)) {

				ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD);

				if (ret < 0)

					return ret;

			}

					} else {

						/* power down event */

						if (w->event_flags & SND_SOC_DAPM_PRE_PMD) {



			dapm_update_bits(w);



			/* power up post event */

			if (power && w->event &&

			    (w->event_flags & SND_SOC_DAPM_POST_PMU)) {

				ret = w->event(w,

								NULL, SND_SOC_DAPM_PRE_PMD);

					       NULL, SND_SOC_DAPM_POST_PMU);

				if (ret < 0)

					return ret;

			}

						dapm_update_bits(w);

						if (w->event_flags & SND_SOC_DAPM_POST_PMD) {

							ret = w->event(w,

								NULL, SND_SOC_DAPM_POST_PMD);



			/* power down post event */

			if (!power && w->event &&

			    (w->event_flags & SND_SOC_DAPM_POST_PMD)) {

				ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD);

				if (ret < 0)

					return ret;

			}

		}

				} else

					/* no event handler */

					dapm_update_bits(w);

			}

		}

	}



	return ret;