Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26f05717 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Drop AZX_DCAPS_POSFIX_VIA bit 



AZX_DCAPS_POSFIX_VIA is coupled always with AZX_DRIVER_VIA type, so we
don't have to keep this bit in dcaps.  Save one more!

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

sound/pci/hda/hda_controller.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
/* 14 unused */

#define AZX_DCAPS_CTX_WORKAROUND (1 << 15)	/* X-Fi workaround */

#define AZX_DCAPS_POSFIX_LPIB	(1 << 16)	/* Use LPIB as default */

#define AZX_DCAPS_POSFIX_VIA	(1 << 17)	/* Use VIACOMBO as default */

/* 17 unused */

#define AZX_DCAPS_NO_64BIT	(1 << 18)	/* No 64bit address */

#define AZX_DCAPS_SYNC_WRITE	(1 << 19)	/* sync each cmd write */

#define AZX_DCAPS_OLD_SSYNC	(1 << 20)	/* Old SSYNC reg for ICH */

sound/pci/hda/hda_intel.c

+2 −3
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ static int check_position_fix(struct azx *chip, int fix) 
	}



	/* Check VIA/ATI HD Audio Controller exist */

	if (chip->driver_caps & AZX_DCAPS_POSFIX_VIA) {

	if (chip->driver_type == AZX_DRIVER_VIA) {

		dev_dbg(chip->card->dev, "Using VIACOMBO position fix\n");

		return POS_FIX_VIACOMBO;

	}
@@ -2284,8 +2284,7 @@ static const struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE(0x1002, 0xaae8),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },

	/* VIA VT8251/VT8237A */

	{ PCI_DEVICE(0x1106, 0x3288),

	  .driver_data = AZX_DRIVER_VIA | AZX_DCAPS_POSFIX_VIA },

	{ PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },

	/* VIA GFX VT7122/VX900 */

	{ PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },

	/* VIA GFX VT6122/VX11 */