Merge branch 'topic/quirk-cleanup' into for-linus
This commit is contained in:
commit
bafdb7278c
|
@ -458,21 +458,33 @@ static inline int __snd_bug_on(int cond)
|
|||
struct snd_pci_quirk {
|
||||
unsigned short subvendor; /* PCI subvendor ID */
|
||||
unsigned short subdevice; /* PCI subdevice ID */
|
||||
unsigned short subdevice_mask; /* bitmask to match */
|
||||
int value; /* value */
|
||||
#ifdef CONFIG_SND_DEBUG_VERBOSE
|
||||
const char *name; /* name of the device (optional) */
|
||||
#endif
|
||||
};
|
||||
|
||||
#define _SND_PCI_QUIRK_ID(vend,dev) \
|
||||
.subvendor = (vend), .subdevice = (dev)
|
||||
#define _SND_PCI_QUIRK_ID_MASK(vend, mask, dev) \
|
||||
.subvendor = (vend), .subdevice = (dev), .subdevice_mask = (mask)
|
||||
#define _SND_PCI_QUIRK_ID(vend, dev) \
|
||||
_SND_PCI_QUIRK_ID_MASK(vend, 0xffff, dev)
|
||||
#define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
|
||||
#ifdef CONFIG_SND_DEBUG_VERBOSE
|
||||
#define SND_PCI_QUIRK(vend,dev,xname,val) \
|
||||
{_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
|
||||
#define SND_PCI_QUIRK_VENDOR(vend, xname, val) \
|
||||
{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val), .name = (xname)}
|
||||
#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val) \
|
||||
{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), \
|
||||
.value = (val), .name = (xname)}
|
||||
#else
|
||||
#define SND_PCI_QUIRK(vend,dev,xname,val) \
|
||||
{_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
|
||||
#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val) \
|
||||
{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), .value = (val)}
|
||||
#define SND_PCI_QUIRK_VENDOR(vend, xname, val) \
|
||||
{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)}
|
||||
#endif
|
||||
|
||||
const struct snd_pci_quirk *
|
||||
|
|
|
@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list)
|
|||
{
|
||||
const struct snd_pci_quirk *q;
|
||||
|
||||
for (q = list; q->subvendor; q++)
|
||||
if (q->subvendor == pci->subsystem_vendor &&
|
||||
(!q->subdevice || q->subdevice == pci->subsystem_device))
|
||||
for (q = list; q->subvendor; q++) {
|
||||
if (q->subvendor != pci->subsystem_vendor)
|
||||
continue;
|
||||
if (!q->subdevice ||
|
||||
(pci->subsystem_device & q->subdevice_mask) == q->subdevice)
|
||||
return q;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(snd_pci_quirk_lookup);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue