[alsa-devel] [PATCH 1/2] ALSA: hda - Rename ASUS subwoofer quirks

[Takashi Iwai]

At Fri,  7 Feb 2014 09:31:07 +0100,
David Henningsson wrote:
> 
> Just a small refactoring to make the next patch slightly simpler.
> 
> Signed-off-by: David Henningsson <david.henningsson at canonical.com>

Thanks, applied both patches but to for-next branch, as this is no
urgent fix.


Takashi

> ---
>  sound/pci/hda/patch_realtek.c |   18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index bee4b8c..0295efe 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -4925,9 +4925,9 @@ enum {
>  	ALC662_FIXUP_INV_DMIC,
>  	ALC668_FIXUP_DELL_MIC_NO_PRESENCE,
>  	ALC668_FIXUP_HEADSET_MODE,
> -	ALC662_FIXUP_BASS_CHMAP,
> +	ALC662_FIXUP_BASS_MODE4_CHMAP,
>  	ALC662_FIXUP_BASS_1A,
> -	ALC662_FIXUP_BASS_1A_CHMAP,
> +	ALC662_FIXUP_BASS_CHMAP,
>  	ALC668_FIXUP_AUTO_MUTE,
>  };
>  
> @@ -5115,7 +5115,7 @@ static const struct hda_fixup alc662_fixups[] = {
>  		.type = HDA_FIXUP_FUNC,
>  		.v.func = alc_fixup_headset_mode_alc668,
>  	},
> -	[ALC662_FIXUP_BASS_CHMAP] = {
> +	[ALC662_FIXUP_BASS_MODE4_CHMAP] = {
>  		.type = HDA_FIXUP_FUNC,
>  		.v.func = alc_fixup_bass_chmap,
>  		.chained = true,
> @@ -5127,12 +5127,12 @@ static const struct hda_fixup alc662_fixups[] = {
>  			{0x1a, 0x80106111}, /* bass speaker */
>  			{}
>  		},
> +		.chained = true,
> +		.chain_id = ALC662_FIXUP_BASS_CHMAP,
>  	},
> -	[ALC662_FIXUP_BASS_1A_CHMAP] = {
> +	[ALC662_FIXUP_BASS_CHMAP] = {
>  		.type = HDA_FIXUP_FUNC,
>  		.v.func = alc_fixup_bass_chmap,
> -		.chained = true,
> -		.chain_id = ALC662_FIXUP_BASS_1A,
>  	},
>  };
>  
> @@ -5153,9 +5153,9 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
>  	SND_PCI_QUIRK(0x1028, 0x0628, "Dell", ALC668_FIXUP_AUTO_MUTE),
>  	SND_PCI_QUIRK(0x1028, 0x064e, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
>  	SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
> -	SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A_CHMAP),
> -	SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP),
> -	SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_CHMAP),
> +	SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A),
> +	SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
> +	SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
>  	SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
>  	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
>  	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
> -- 
> 1.7.9.5
>