Skip to content

Commit

Permalink
ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff
Browse files Browse the repository at this point in the history
This is no longer necessary, as we're no longer doing indexed i/o commands.

Signed-off-by: Andres Salomon <dilinger@debian.org>
  • Loading branch information
Andres Salomon authored and Takashi Iwai committed Dec 10, 2008
1 parent 3556d18 commit b91254e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
3 changes: 0 additions & 3 deletions sound/pci/cs5535audio/cs5535audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions sound/pci/cs5535audio/cs5535audio_olpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -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;
}

Expand Down

0 comments on commit b91254e

Please sign in to comment.