Commit e2b6d13b authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[ALSA] nm256 - Use quirk list helper function

Clean up nm256-quirk lookup using snd_pci_quirk_lookup().
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent f41bea84
...@@ -1628,23 +1628,15 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci, ...@@ -1628,23 +1628,15 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
} }
struct nm256_quirk {
unsigned short vendor;
unsigned short device;
int type;
};
enum { NM_BLACKLISTED, NM_RESET_WORKAROUND, NM_RESET_WORKAROUND_2 }; enum { NM_BLACKLISTED, NM_RESET_WORKAROUND, NM_RESET_WORKAROUND_2 };
static struct nm256_quirk nm256_quirks[] __devinitdata = { static struct snd_pci_quirk nm256_quirks[] __devinitdata = {
/* HP omnibook 4150 has cs4232 codec internally */ /* HP omnibook 4150 has cs4232 codec internally */
{ .vendor = 0x103c, .device = 0x0007, .type = NM_BLACKLISTED }, SND_PCI_QUIRK(0x103c, 0x0007, "HP omnibook 4150", NM_BLACKLISTED),
/* Sony PCG-F305 */ /* Reset workarounds to avoid lock-ups */
{ .vendor = 0x104d, .device = 0x8041, .type = NM_RESET_WORKAROUND }, SND_PCI_QUIRK(0x104d, 0x8041, "Sony PCG-F305", NM_RESET_WORKAROUND),
/* Dell Latitude LS */ SND_PCI_QUIRK(0x1028, 0x0080, "Dell Latitude LS", NM_RESET_WORKAROUND),
{ .vendor = 0x1028, .device = 0x0080, .type = NM_RESET_WORKAROUND }, SND_PCI_QUIRK(0x1028, 0x0091, "Dell Latitude CSx", NM_RESET_WORKAROUND_2),
/* Dell Latitude CSx */
{ .vendor = 0x1028, .device = 0x0091, .type = NM_RESET_WORKAROUND_2 },
{ } /* terminator */ { } /* terminator */
}; };
...@@ -1655,15 +1647,12 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci, ...@@ -1655,15 +1647,12 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
struct snd_card *card; struct snd_card *card;
struct nm256 *chip; struct nm256 *chip;
int err; int err;
struct nm256_quirk *q; const struct snd_pci_quirk *q;
u16 subsystem_vendor, subsystem_device;
pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); q = snd_pci_quirk_lookup(pci, nm256_quirks);
pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device); if (q) {
snd_printdd(KERN_INFO "nm256: Enabled quirk for %s.\n", q->name);
for (q = nm256_quirks; q->vendor; q++) { switch (q->value) {
if (q->vendor == subsystem_vendor && q->device == subsystem_device) {
switch (q->type) {
case NM_BLACKLISTED: case NM_BLACKLISTED:
printk(KERN_INFO "nm256: The device is blacklisted. " printk(KERN_INFO "nm256: The device is blacklisted. "
"Loading stopped\n"); "Loading stopped\n");
...@@ -1676,7 +1665,6 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci, ...@@ -1676,7 +1665,6 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
break; break;
} }
} }
}
card = snd_card_new(index, id, THIS_MODULE, 0); card = snd_card_new(index, id, THIS_MODULE, 0);
if (card == NULL) if (card == NULL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment