diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-09-01 14:25:08 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-09-04 10:33:51 +0200 |
| commit | d695e4ea860fc1cbe1e4b101af4e0450219f2db9 (patch) | |
| tree | f04c7f755f4fe3b42ec24402f4ccbd874d46c65d /sound/pci/intel8x0.c | |
| parent | 90f31e382b9bb4313327ab504874385654b501fe (diff) | |
| download | linux-d695e4ea860fc1cbe1e4b101af4e0450219f2db9.tar.bz2 | |
ALSA: intel8x0 - use snd_pci_quirk for clock list
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/intel8x0.c')
| -rw-r--r-- | sound/pci/intel8x0.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index c8f514896841..f7b4d0c5d49d 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -2692,36 +2692,26 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0); } -struct intel8x0_clock_list { - unsigned short subvendor; - unsigned short subdevice; - unsigned int rate; -}; - -static struct intel8x0_clock_list intel8x0_clock_list[] __devinitdata = { - { 0x0e11, 0x008a, 41000 }, /* Analog Devices AD1885 */ - { 0x1028, 0x00be, 44100 }, /* Analog Devices AD1885 */ - { 0x1028, 0x0177, 48000 }, /* Analog Devices AD1980 */ - { 0x1043, 0x80f3, 48000 }, /* Analog Devices AD1985 */ - { 0x0000, 0x0000, 00000 } /* terminator */ +static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = { + SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000), + SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100), + SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000), + SND_PCI_QUIRK(0x1043, 0x80f3, "AD1985", 48000), + { } /* terminator */ }; static int __devinit intel8x0_in_clock_list(struct intel8x0 *chip) { struct pci_dev *pci = chip->pci; - struct intel8x0_clock_list *wl; - - for (wl = intel8x0_clock_list; wl->subvendor; wl++) { - if (wl->subvendor == pci->subsystem_vendor && - wl->subdevice == pci->subsystem_device) { - printk(KERN_INFO "intel8x0: white list rate for %04x:%04x is %i\n", - pci->subsystem_vendor, - pci->subsystem_device, wl->rate); - chip->ac97_bus->clock = wl->rate; - return 1; - } - } - return 0; + const struct snd_pci_quirk *wl; + + wl = snd_pci_quirk_lookup(pci, intel8x0_clock_list); + if (!wl) + return 0; + printk(KERN_INFO "intel8x0: white list rate for %04x:%04x is %i\n", + pci->subsystem_vendor, pci->subsystem_device, wl->value); + chip->ac97_bus->clock = wl->value; + return 1; } #ifdef CONFIG_PROC_FS |