mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
ALSA: nm256: Replace the words blacklist
Follow the recent inclusive terminology guidelines and replace the words "whitelist" and "blacklist" appropriately. Only comment or enum/variable renames, no functional changes. Link: https://lore.kernel.org/r/20200714172631.25371-9-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
7ce78fc845
commit
03fa2a7a12
@ -1632,11 +1632,11 @@ __error:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
enum { NM_BLACKLISTED, NM_RESET_WORKAROUND, NM_RESET_WORKAROUND_2 };
|
enum { NM_IGNORED, NM_RESET_WORKAROUND, NM_RESET_WORKAROUND_2 };
|
||||||
|
|
||||||
static const struct snd_pci_quirk nm256_quirks[] = {
|
static const struct snd_pci_quirk nm256_quirks[] = {
|
||||||
/* HP omnibook 4150 has cs4232 codec internally */
|
/* HP omnibook 4150 has cs4232 codec internally */
|
||||||
SND_PCI_QUIRK(0x103c, 0x0007, "HP omnibook 4150", NM_BLACKLISTED),
|
SND_PCI_QUIRK(0x103c, 0x0007, "HP omnibook 4150", NM_IGNORED),
|
||||||
/* Reset workarounds to avoid lock-ups */
|
/* Reset workarounds to avoid lock-ups */
|
||||||
SND_PCI_QUIRK(0x104d, 0x8041, "Sony PCG-F305", NM_RESET_WORKAROUND),
|
SND_PCI_QUIRK(0x104d, 0x8041, "Sony PCG-F305", NM_RESET_WORKAROUND),
|
||||||
SND_PCI_QUIRK(0x1028, 0x0080, "Dell Latitude LS", NM_RESET_WORKAROUND),
|
SND_PCI_QUIRK(0x1028, 0x0080, "Dell Latitude LS", NM_RESET_WORKAROUND),
|
||||||
@ -1658,9 +1658,9 @@ static int snd_nm256_probe(struct pci_dev *pci,
|
|||||||
dev_dbg(&pci->dev, "Enabled quirk for %s.\n",
|
dev_dbg(&pci->dev, "Enabled quirk for %s.\n",
|
||||||
snd_pci_quirk_name(q));
|
snd_pci_quirk_name(q));
|
||||||
switch (q->value) {
|
switch (q->value) {
|
||||||
case NM_BLACKLISTED:
|
case NM_IGNORED:
|
||||||
dev_info(&pci->dev,
|
dev_info(&pci->dev,
|
||||||
"The device is blacklisted. Loading stopped\n");
|
"The device is on the denylist. Loading stopped\n");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
case NM_RESET_WORKAROUND_2:
|
case NM_RESET_WORKAROUND_2:
|
||||||
reset_workaround_2 = 1;
|
reset_workaround_2 = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user