aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-03-15 08:08:20 -0500
committerJaroslav Kysela <perex@suse.cz>2006-03-22 04:38:53 -0500
commit0a589d80191471754e6f6cab3015a879bca2f7d2 (patch)
tree63db0413b3f1f6a18e67904ad3143f99f39ca2f3 /sound/pci
parenta23446c085faed6c1c90fba5cdd21d6990871750 (diff)
[ALSA] ac97 - Clean up obsolete workarounds
Modules: AC97 Codec Clean up obsolete workarounds provided only for nm256. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/ac97/ac97_codec.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index c5bbdcbf5422..278319bbdea1 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -192,9 +192,6 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
192 192
193static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg) 193static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg)
194{ 194{
195 if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
196 return 0;
197
198 /* filter some registers for buggy codecs */ 195 /* filter some registers for buggy codecs */
199 switch (ac97->id) { 196 switch (ac97->id) {
200 case AC97_ID_AK4540: 197 case AC97_ID_AK4540:
@@ -1008,9 +1005,6 @@ static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg)
1008 break; 1005 break;
1009 } 1006 }
1010 1007
1011 if (ac97->limited_regs && test_bit(reg, ac97->reg_accessed))
1012 return 1; /* allow without check */
1013
1014 val = snd_ac97_read(ac97, reg); 1008 val = snd_ac97_read(ac97, reg);
1015 if (!(val & mask)) { 1009 if (!(val & mask)) {
1016 /* nothing seems to be here - mute flag is not set */ 1010 /* nothing seems to be here - mute flag is not set */
@@ -1866,8 +1860,6 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
1866 ac97->num = template->num; 1860 ac97->num = template->num;
1867 ac97->addr = template->addr; 1861 ac97->addr = template->addr;
1868 ac97->scaps = template->scaps; 1862 ac97->scaps = template->scaps;
1869 ac97->limited_regs = template->limited_regs;
1870 memcpy(ac97->reg_accessed, template->reg_accessed, sizeof(ac97->reg_accessed));
1871 ac97->res_table = template->res_table; 1863 ac97->res_table = template->res_table;
1872 bus->codec[ac97->num] = ac97; 1864 bus->codec[ac97->num] = ac97;
1873 mutex_init(&ac97->reg_mutex); 1865 mutex_init(&ac97->reg_mutex);