ASoC: wm9705: Remove ac97_read/ac97_write wrappers
Since the regmap conversion ac97_read/ac97_write are just simple wrappers around snd_soc_read/snd_soc_write. Use those instead directly and remove the wrappers. Also use snd_soc_update_bits() where appropriate. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
206964e826
commit
1457de3b87
|
@ -226,33 +226,20 @@ static const struct snd_soc_dapm_route wm9705_audio_map[] = {
|
|||
{"Right ADC", NULL, "ADC PGA"},
|
||||
};
|
||||
|
||||
static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg)
|
||||
{
|
||||
return snd_soc_read(codec, reg);
|
||||
}
|
||||
|
||||
static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
|
||||
unsigned int val)
|
||||
{
|
||||
return snd_soc_write(codec, reg, val);
|
||||
}
|
||||
|
||||
static int ac97_prepare(struct snd_pcm_substream *substream,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
int reg;
|
||||
u16 vra;
|
||||
|
||||
vra = ac97_read(codec, AC97_EXTENDED_STATUS);
|
||||
ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1);
|
||||
snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x1, 0x1);
|
||||
|
||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
reg = AC97_PCM_FRONT_DAC_RATE;
|
||||
else
|
||||
reg = AC97_PCM_LR_ADC_RATE;
|
||||
|
||||
return ac97_write(codec, reg, substream->runtime->rate);
|
||||
return snd_soc_write(codec, reg, substream->runtime->rate);
|
||||
}
|
||||
|
||||
#define WM9705_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | \
|
||||
|
@ -299,7 +286,7 @@ static struct snd_soc_dai_driver wm9705_dai[] = {
|
|||
static int wm9705_soc_suspend(struct snd_soc_codec *codec)
|
||||
{
|
||||
regcache_cache_bypass(codec->component.regmap, true);
|
||||
ac97_write(codec, AC97_POWERDOWN, 0xffff);
|
||||
snd_soc_write(codec, AC97_POWERDOWN, 0xffff);
|
||||
regcache_cache_bypass(codec->component.regmap, false);
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue