[alsa-devel] [PATCH 2/3] ALSA: hda - no-primary-hp is a quirk for model ALC889 not ALC882

[Takashi Iwai]

At Tue, 12 Feb 2013 16:54:16 +0900,
Fernando Luis Vázquez Cao wrote:
> 
> Substitute ALC889 for ALC882 in macro and function names.
> 
> Cc: stable at vger.kernel.org
> Cc: alsa-devel at alsa-project.org
> Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>

This fixup can work generically to all ALC882 variants, including
ALC889.  Unless you are really sure that this must be used exclusively
only for ALC889, no reason to change the prefix.


thanks,

Takashi


> ---
> 
> diff -urNp linux-3.7.6-orig/sound/pci/hda/patch_realtek.c linux-3.7.6/sound/pci/hda/patch_realtek.c
> --- linux-3.7.6-orig/sound/pci/hda/patch_realtek.c	2013-02-09 22:52:40.301209823 +0900
> +++ linux-3.7.6/sound/pci/hda/patch_realtek.c	2013-02-09 22:58:54.695063675 +0900
> @@ -5030,7 +5030,7 @@ enum {
>  	ALC889_FIXUP_MBP_VREF,
>  	ALC889_FIXUP_IMAC91_VREF,
>  	ALC882_FIXUP_INV_DMIC,
> -	ALC882_FIXUP_NO_PRIMARY_HP,
> +	ALC889_FIXUP_NO_PRIMARY_HP,
>  };
>  
>  static void alc889_fixup_coef(struct hda_codec *codec,
> @@ -5156,7 +5156,7 @@ static void alc889_fixup_imac91_vref(str
>   * Strangely, the speaker output doesn't work on Vaio Z and some Vaio
>   * all-in-one desktop PCs (for example VGC-LN51JGB) through DAC 0x05
>   */
> -static void alc882_fixup_no_primary_hp(struct hda_codec *codec,
> +static void alc889_fixup_no_primary_hp(struct hda_codec *codec,
>  				       const struct alc_fixup *fix, int action)
>  {
>  	struct alc_spec *spec = codec->spec;
> @@ -5350,9 +5350,9 @@ static const struct alc_fixup alc882_fix
>  		.type = ALC_FIXUP_FUNC,
>  		.v.func = alc_fixup_inv_dmic_0x12,
>  	},
> -	[ALC882_FIXUP_NO_PRIMARY_HP] = {
> +	[ALC889_FIXUP_NO_PRIMARY_HP] = {
>  		.type = ALC_FIXUP_FUNC,
> -		.v.func = alc882_fixup_no_primary_hp,
> +		.v.func = alc889_fixup_no_primary_hp,
>  	},
>  };
>  
> @@ -5388,8 +5388,8 @@ static const struct snd_pci_quirk alc882
>  	SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC),
>  	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),
>  	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),
> -	SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),
> -	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),
> +	SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC889_FIXUP_NO_PRIMARY_HP),
> +	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC889_FIXUP_NO_PRIMARY_HP),
>  
>  	/* All Apple entries are in codec SSIDs */
>  	SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF),
> @@ -5432,7 +5432,7 @@ static const struct alc_model_fixup alc8
>  	{.id = ALC882_FIXUP_ACER_ASPIRE_8930G, .name = "acer-aspire-8930g"},
>  	{.id = ALC883_FIXUP_ACER_EAPD, .name = "acer-aspire"},
>  	{.id = ALC882_FIXUP_INV_DMIC, .name = "inv-dmic"},
> -	{.id = ALC882_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"},
> +	{.id = ALC889_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"},
>  	{}
>  };
>  
> 
>