Skip to content

Commit

Permalink
[ALSA] atiixp - Use quirk list helper function
Browse files Browse the repository at this point in the history
Clean up ac97_codec quirk using snd_pci_quirk_lookup().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Feb 9, 2007
1 parent d9ea472 commit f41bea8
Showing 1 changed file with 10 additions and 26 deletions.
36 changes: 10 additions & 26 deletions sound/pci/atiixp.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,21 +296,9 @@ static struct pci_device_id snd_atiixp_ids[] = {

MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);

struct atiixp_quirk {
unsigned short subvendor;
unsigned short subdevice;
const char *name;
int ac97_codec;
};

static struct atiixp_quirk atiixp_quirks[] __devinitdata = {
{
.subvendor = 0x15bd,
.subdevice = 0x3100,
.name = "DFI RS482",
.ac97_codec = 0,
},
{ .subvendor = 0 } /* terminator */
static struct snd_pci_quirk atiixp_quirks[] __devinitdata = {
SND_PCI_QUIRK(0x15bd, 0x3100, "DFI RS482", 0),
{ } /* terminator */
};

/*
Expand Down Expand Up @@ -574,17 +562,13 @@ static int snd_atiixp_aclink_down(struct atiixp *chip)

static int ac97_probing_bugs(struct pci_dev *pci)
{
int i = 0;

while (atiixp_quirks[i].subvendor) {
if (pci->subsystem_vendor == atiixp_quirks[i].subvendor &&
pci->subsystem_device == atiixp_quirks[i].subdevice) {
printk(KERN_INFO "Atiixp quirk for %s. "
"Forcing codec %d\n", atiixp_quirks[i].name,
atiixp_quirks[i].ac97_codec);
return atiixp_quirks[i].ac97_codec;
}
i++;
const struct snd_pci_quirk *q;

q = snd_pci_quirk_lookup(pci, atiixp_quirks);
if (q) {
snd_printdd(KERN_INFO "Atiixp quirk for %s. "
"Forcing codec %d\n", q->name, q->value);
return q->value;
}
/* this hardware doesn't need workarounds. Probe for codec */
return -1;
Expand Down

0 comments on commit f41bea8

Please sign in to comment.