diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-04-12 13:31:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-13 13:34:54 -0400 |
commit | 621206b76825f24ccb650b9f59c18c17f6760a4c (patch) | |
tree | fe2cc834ceeeff4a0c1454f33855473f2ba99883 /sound | |
parent | c6f0ede7c563497f6d7fef847a965d7fd63d86f9 (diff) |
ASoC: JZ4740: qi_lb60: Use the SND_SOC_DAPM_EVENT_OFF for the speakers status
Use SND_SOC_DAPM_EVENT_OFF for determining whether the speaker should be turned
on or off instead of open coding it.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/jz4740/qi_lb60.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c index 8c4e84bcc320..c5fc339f68f1 100644 --- a/sound/soc/jz4740/qi_lb60.c +++ b/sound/soc/jz4740/qi_lb60.c | |||
@@ -27,11 +27,7 @@ | |||
27 | static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget, | 27 | static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget, |
28 | struct snd_kcontrol *ctrl, int event) | 28 | struct snd_kcontrol *ctrl, int event) |
29 | { | 29 | { |
30 | int on = 0; | 30 | int on = !SND_SOC_DAPM_EVENT_OFF(event); |
31 | if (event & SND_SOC_DAPM_POST_PMU) | ||
32 | on = 1; | ||
33 | else if (event & SND_SOC_DAPM_PRE_PMD) | ||
34 | on = 0; | ||
35 | 31 | ||
36 | gpio_set_value(QI_LB60_SND_GPIO, on); | 32 | gpio_set_value(QI_LB60_SND_GPIO, on); |
37 | gpio_set_value(QI_LB60_AMP_GPIO, on); | 33 | gpio_set_value(QI_LB60_AMP_GPIO, on); |