Commit 6317e5eb authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Replace the words white/blacklist 

Follow the recent inclusive terminology guidelines and replace the
words "whitelist" and "blacklist" appropriately.

Only comment or variable renames, no functional changes.

Note that pm_blacklist module option is still kept as was, so that
users can still keep the old option.

Link: https://lore.kernel.org/r/20200714172631.25371-7-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent abe092ae

sound/pci/hda/hda_intel.c

+13 −13
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ MODULE_PARM_DESC(power_save, "Automatic power-saving timeout " 


static bool pm_blacklist = true;

module_param(pm_blacklist, bool, 0644);

MODULE_PARM_DESC(pm_blacklist, "Enable power-management blacklist");

MODULE_PARM_DESC(pm_blacklist, "Enable power-management denylist");



/* reset the HD-audio controller in power save mode.

 * this may give more power-saving, but will take longer time to
@@ -1506,7 +1506,7 @@ static bool check_hdmi_disabled(struct pci_dev *pci) 
#endif /* SUPPORT_VGA_SWITCHEROO */



/*

 * white/black-listing for position_fix

 * allow/deny-listing for position_fix

 */

static const struct snd_pci_quirk position_fix_list[] = {

	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
@@ -1599,7 +1599,7 @@ static void assign_position_fix(struct azx *chip, int fix) 
}



/*

 * black-lists for probe_mask

 * deny-lists for probe_mask

 */

static const struct snd_pci_quirk probe_mask_list[] = {

	/* Thinkpad often breaks the controller communication when accessing
@@ -1647,9 +1647,9 @@ static void check_probe_mask(struct azx *chip, int dev) 
}



/*

 * white/black-list for enable_msi

 * allow/deny-list for enable_msi

 */

static const struct snd_pci_quirk msi_black_list[] = {

static const struct snd_pci_quirk msi_deny_list[] = {

	SND_PCI_QUIRK(0x103c, 0x2191, "HP", 0), /* AMD Hudson */

	SND_PCI_QUIRK(0x103c, 0x2192, "HP", 0), /* AMD Hudson */

	SND_PCI_QUIRK(0x103c, 0x21f7, "HP", 0), /* AMD Hudson */
@@ -1672,7 +1672,7 @@ static void check_msi(struct azx *chip) 
		return;

	}

	chip->msi = 1;	/* enable MSI as default */

	q = snd_pci_quirk_lookup(chip->pci, msi_black_list);

	q = snd_pci_quirk_lookup(chip->pci, msi_deny_list);

	if (q) {

		dev_info(chip->card->dev,

			 "msi for device %04x:%04x set to %d\n",
@@ -2072,11 +2072,11 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream, 
#endif

}



/* Blacklist for skipping the whole probe:

/* Denylist for skipping the whole probe:

 * some HD-audio PCI entries are exposed without any codecs, and such devices

 * should be ignored from the beginning.

 */

static const struct pci_device_id driver_blacklist[] = {

static const struct pci_device_id driver_denylist[] = {

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */
@@ -2099,8 +2099,8 @@ static int azx_probe(struct pci_dev *pci, 
	bool schedule_probe;

	int err;



	if (pci_match_id(driver_blacklist, pci)) {

		dev_info(&pci->dev, "Skipping the blacklisted device\n");

	if (pci_match_id(driver_denylist, pci)) {

		dev_info(&pci->dev, "Skipping the device on the denylist\n");

		return -ENODEV;

	}
@@ -2190,7 +2190,7 @@ static int azx_probe(struct pci_dev *pci, 
 * So we keep a list of devices where we disable powersaving as its known

 * to causes problems on these devices.

 */

static const struct snd_pci_quirk power_save_blacklist[] = {

static const struct snd_pci_quirk power_save_denylist[] = {

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1849, 0xc892, "Asrock B85M-ITX", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
@@ -2236,9 +2236,9 @@ static void set_default_power_save(struct azx *chip) 
	if (pm_blacklist) {

		const struct snd_pci_quirk *q;



		q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);

		q = snd_pci_quirk_lookup(chip->pci, power_save_denylist);

		if (q && val) {

			dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n",

			dev_info(chip->card->dev, "device %04x:%04x is on the power_save denylist, forcing power_save to 0\n",

				 q->subvendor, q->subdevice);

			val = 0;

		}

sound/pci/hda/patch_realtek.c

+3 −3
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static int set_beep_amp(struct alc_spec *spec, hda_nid_t nid, 
	return 0;

}



static const struct snd_pci_quirk beep_white_list[] = {

static const struct snd_pci_quirk beep_allow_list[] = {

	SND_PCI_QUIRK(0x1043, 0x103c, "ASUS", 1),

	SND_PCI_QUIRK(0x1043, 0x115d, "ASUS", 1),

	SND_PCI_QUIRK(0x1043, 0x829f, "ASUS", 1),
@@ -1088,7 +1088,7 @@ static const struct snd_pci_quirk beep_white_list[] = { 
	SND_PCI_QUIRK(0x1043, 0x834a, "EeePC", 1),

	SND_PCI_QUIRK(0x1458, 0xa002, "GA-MA790X", 1),

	SND_PCI_QUIRK(0x8086, 0xd613, "Intel", 1),

	/* blacklist -- no beep available */

	/* denylist -- no beep available */

	SND_PCI_QUIRK(0x17aa, 0x309e, "Lenovo ThinkCentre M73", 0),

	SND_PCI_QUIRK(0x17aa, 0x30a3, "Lenovo ThinkCentre M93", 0),

	{}
@@ -1098,7 +1098,7 @@ static inline int has_cdefine_beep(struct hda_codec *codec) 
{

	struct alc_spec *spec = codec->spec;

	const struct snd_pci_quirk *q;

	q = snd_pci_quirk_lookup(codec->bus->pci, beep_white_list);

	q = snd_pci_quirk_lookup(codec->bus->pci, beep_allow_list);

	if (q)

		return q->value;

	return spec->cdefine.enable_pcbeep;