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

Commit 8cc14e13 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood
Browse files

ASoC: tpa6130a2: Use one event handler for PGA_E 



Reduce the amount of duplicated code by using single
event handler for PGA_E to enable the needed channel.
Use the w->shift to pass the channel information to
the handler function.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent d534bacd

sound/soc/codecs/tpa6130a2.c

+5 −19
Original line number Original line Diff line number Diff line
@@ -317,29 +317,15 @@ static void tpa6130a2_channel_enable(u8 channel, int enable) 
	}

	}

}

}





static int tpa6130a2_left_event(struct snd_soc_dapm_widget *w,

static int tpa6130a2_pga_event(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

		struct snd_kcontrol *kcontrol, int event)

{

{

	switch (event) {

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMU:

		tpa6130a2_channel_enable(TPA6130A2_HP_EN_L, 1);

		tpa6130a2_channel_enable(w->shift, 1);

		break;

		break;

	case SND_SOC_DAPM_POST_PMD:

	case SND_SOC_DAPM_POST_PMD:

		tpa6130a2_channel_enable(TPA6130A2_HP_EN_L, 0);

		tpa6130a2_channel_enable(w->shift, 0);

		break;

	}

	return 0;

}



static int tpa6130a2_right_event(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

{

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		tpa6130a2_channel_enable(TPA6130A2_HP_EN_R, 1);

		break;

	case SND_SOC_DAPM_POST_PMD:

		tpa6130a2_channel_enable(TPA6130A2_HP_EN_R, 0);

		break;

		break;

	}

	}

	return 0;

	return 0;
@@ -363,10 +349,10 @@ static int tpa6130a2_supply_event(struct snd_soc_dapm_widget *w, 




static const struct snd_soc_dapm_widget tpa6130a2_dapm_widgets[] = {

static const struct snd_soc_dapm_widget tpa6130a2_dapm_widgets[] = {

	SND_SOC_DAPM_PGA_E("TPA6130A2 Left", SND_SOC_NOPM,

	SND_SOC_DAPM_PGA_E("TPA6130A2 Left", SND_SOC_NOPM,

			0, 0, NULL, 0, tpa6130a2_left_event,

			TPA6130A2_HP_EN_L, 0, NULL, 0, tpa6130a2_pga_event,

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_PGA_E("TPA6130A2 Right", SND_SOC_NOPM,

	SND_SOC_DAPM_PGA_E("TPA6130A2 Right", SND_SOC_NOPM,

			0, 0, NULL, 0, tpa6130a2_right_event,

			TPA6130A2_HP_EN_R, 0, NULL, 0, tpa6130a2_pga_event,

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_SUPPLY("TPA6130A2 Enable", SND_SOC_NOPM,

	SND_SOC_DAPM_SUPPLY("TPA6130A2 Enable", SND_SOC_NOPM,

			0, 0, tpa6130a2_supply_event,

			0, 0, tpa6130a2_supply_event,