* [PATCH 4/14] ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff
@ 2008-11-06 21:46 Andres Salomon
0 siblings, 0 replies; only message in thread
From: Andres Salomon @ 2008-11-06 21:46 UTC (permalink / raw)
To: jayakumar.alsa; +Cc: linux-kernel, akpm, Takashi Iwai
This is no longer necessary, as we're no longer doing indexed i/o commands.
Signed-off-by: Andres Salomon <dilinger@debian.org>
---
sound/pci/cs5535audio/cs5535audio.h | 3 ---
sound/pci/cs5535audio/cs5535audio_olpc.c | 9 +--------
2 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 93602cf..31ecb33 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -92,9 +92,6 @@ struct cs5535audio {
struct snd_pcm_substream *playback_substream;
struct snd_pcm_substream *capture_substream;
struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];
-#ifdef CONFIG_OLPC
- int ec_analog_input_mode;
-#endif
};
#ifdef CONFIG_PM
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index adc10a3..16b41d4 100644
--- a/sound/pci/cs5535audio/cs5535audio_olpc.c
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -38,8 +38,7 @@ static int snd_cs5535audio_ctl_get(struct snd_kcontrol *kcontrol,
reg1 = snd_ac97_read(cs5535au->ac97, AC97_AD_MISC);
reg2 = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
- if ((reg1 & AD1888_VREFOUT_EN_BIT) && (reg2 & AD1888_HPF_EN_BIT) &&
- cs5535au->ec_analog_input_mode)
+ if ((reg1 & AD1888_VREFOUT_EN_BIT) && (reg2 & AD1888_HPF_EN_BIT))
ucontrol->value.integer.value[0] = 1;
else
ucontrol->value.integer.value[0] = 0;
@@ -58,10 +57,6 @@ static int snd_cs5535audio_ctl_put(struct snd_kcontrol *kcontrol,
/* value is 1 if analog input is desired */
value = ucontrol->value.integer.value[0];
- /* use ec mode as flag to determine if any change needed */
- if (cs5535au->ec_analog_input_mode == value)
- return 0;
-
/* sets High Z on VREF Bias if 1 */
if (value)
err = snd_ac97_update_bits(ac97, AC97_AD_MISC,
@@ -88,8 +83,6 @@ static int snd_cs5535audio_ctl_put(struct snd_kcontrol *kcontrol,
else
geode_gpio_clear(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
- cs5535au->ec_analog_input_mode = value;
-
return 1;
}
--
1.5.6.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-06 21:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-06 21:46 [PATCH 4/14] ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff Andres Salomon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.