Signed-off-by: Barry Song Baohua.Song@csr.com --- sound/soc/codecs/ad1980.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 7257a88..be5032c 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -61,39 +61,39 @@ static const struct soc_enum ad1980_cap_src = SOC_ENUM_DOUBLE(AC97_REC_SEL, 8, 0, 7, ad1980_rec_sel);

static const struct snd_kcontrol_new ad1980_snd_ac97_controls[] = { -SOC_DOUBLE("Master Playback Volume", AC97_MASTER, 8, 0, 31, 1), -SOC_SINGLE("Master Playback Switch", AC97_MASTER, 15, 1, 1), + SOC_DOUBLE("Master Playback Volume", AC97_MASTER, 8, 0, 31, 1), + SOC_SINGLE("Master Playback Switch", AC97_MASTER, 15, 1, 1),

-SOC_DOUBLE("Headphone Playback Volume", AC97_HEADPHONE, 8, 0, 31, 1), -SOC_SINGLE("Headphone Playback Switch", AC97_HEADPHONE, 15, 1, 1), + SOC_DOUBLE("Headphone Playback Volume", AC97_HEADPHONE, 8, 0, 31, 1), + SOC_SINGLE("Headphone Playback Switch", AC97_HEADPHONE, 15, 1, 1),

-SOC_DOUBLE("PCM Playback Volume", AC97_PCM, 8, 0, 31, 1), -SOC_SINGLE("PCM Playback Switch", AC97_PCM, 15, 1, 1), + SOC_DOUBLE("PCM Playback Volume", AC97_PCM, 8, 0, 31, 1), + SOC_SINGLE("PCM Playback Switch", AC97_PCM, 15, 1, 1),

-SOC_DOUBLE("PCM Capture Volume", AC97_REC_GAIN, 8, 0, 31, 0), -SOC_SINGLE("PCM Capture Switch", AC97_REC_GAIN, 15, 1, 1), + SOC_DOUBLE("PCM Capture Volume", AC97_REC_GAIN, 8, 0, 31, 0), + SOC_SINGLE("PCM Capture Switch", AC97_REC_GAIN, 15, 1, 1),

-SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1), -SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1), + SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1), + SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),

-SOC_SINGLE("Phone Capture Volume", AC97_PHONE, 0, 31, 1), -SOC_SINGLE("Phone Capture Switch", AC97_PHONE, 15, 1, 1), + SOC_SINGLE("Phone Capture Volume", AC97_PHONE, 0, 31, 1), + SOC_SINGLE("Phone Capture Switch", AC97_PHONE, 15, 1, 1),

-SOC_SINGLE("Mic Volume", AC97_MIC, 0, 31, 1), -SOC_SINGLE("Mic Switch", AC97_MIC, 15, 1, 1), + SOC_SINGLE("Mic Volume", AC97_MIC, 0, 31, 1), + SOC_SINGLE("Mic Switch", AC97_MIC, 15, 1, 1),

-SOC_SINGLE("Stereo Mic Switch", AC97_AD_MISC, 6, 1, 0), -SOC_DOUBLE("Line HP Swap Switch", AC97_AD_MISC, 10, 5, 1, 0), + SOC_SINGLE("Stereo Mic Switch", AC97_AD_MISC, 6, 1, 0), + SOC_DOUBLE("Line HP Swap Switch", AC97_AD_MISC, 10, 5, 1, 0),

-SOC_DOUBLE("Surround Playback Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1), -SOC_DOUBLE("Surround Playback Switch", AC97_SURROUND_MASTER, 15, 7, 1, 1), + SOC_DOUBLE("Surround Playback Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1), + SOC_DOUBLE("Surround Playback Switch", AC97_SURROUND_MASTER, 15, 7, 1, 1),

-SOC_DOUBLE("Center/LFE Playback Volume", AC97_CENTER_LFE_MASTER, 8, 0, 31, 1), -SOC_DOUBLE("Center/LFE Playback Switch", AC97_CENTER_LFE_MASTER, 15, 7, 1, 1), + SOC_DOUBLE("Center/LFE Playback Volume", AC97_CENTER_LFE_MASTER, 8, 0, 31, 1), + SOC_DOUBLE("Center/LFE Playback Switch", AC97_CENTER_LFE_MASTER, 15, 7, 1, 1),

-SOC_ENUM("Capture Source", ad1980_cap_src), + SOC_ENUM("Capture Source", ad1980_cap_src),

-SOC_SINGLE("Mic Boost Switch", AC97_MIC, 6, 1, 0), + SOC_SINGLE("Mic Boost Switch", AC97_MIC, 6, 1, 0), };

static const struct snd_soc_dapm_widget ad1980_dapm_widgets[] = {