Patchwork [precise,SRU] ALSA: hda: remove unused quirk for inverted mute led

login
register
mail settings
Submitter James M. Leddy
Date March 13, 2013, 6:59 p.m.
Message ID <1363201152-4194-1-git-send-email-james.leddy@canonical.com>
Download mbox | patch
Permalink /patch/227332/
State New
Headers show

Comments

James M. Leddy - March 13, 2013, 6:59 p.m.
From: Gustavo Maciel Dias Vieira <gustavo@sagui.org>

BugLink: https://bugs.launchpad.net/bugs/1077084
cherry-picked from: 97e287626a219e3754a54ac654691c608b78341d

AMD is concerned that users that have downloaded 12.04.0 or 12.04.1
will not get this fix automatically.

Original commit message follows:

Commit b99a776d0b17ae0f3a54e86009887a00ac4889d0 removed all effects of
the STAC92HD83* model quirk "hp". However, it left the model selection
and documentation behind, confusing users with inverted mute
leds. Completely remove this quirk and its documentation.

Signed-off-by: Gustavo Maciel Dias Vieira <gustavo@sagui.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: James M Leddy <james.leddy@canonical.com>
---
 Documentation/sound/alsa/HD-Audio-Models.txt |    1 -
 sound/pci/hda/patch_sigmatel.c               |    4 ----
 2 files changed, 5 deletions(-)
Tim Gardner - March 13, 2013, 7:21 p.m.
Only affects Precise:

git describe --contains 97e287626a219e3754a54ac654691c608b78341d
v3.3-rc1~32^2~6^2~17

Dropped Takashi et al from Cc as I doubt they really care what we do
with our kernel.
Leann Ogasawara - March 14, 2013, 2:17 p.m.
On 03/13/2013 11:59 AM, James M Leddy wrote:
> From: Gustavo Maciel Dias Vieira <gustavo@sagui.org>
>
> BugLink: https://bugs.launchpad.net/bugs/1077084
> cherry-picked from: 97e287626a219e3754a54ac654691c608b78341d
>
> AMD is concerned that users that have downloaded 12.04.0 or 12.04.1
> will not get this fix automatically.
>
> Original commit message follows:
>
> Commit b99a776d0b17ae0f3a54e86009887a00ac4889d0 removed all effects of
> the STAC92HD83* model quirk "hp". However, it left the model selection
> and documentation behind, confusing users with inverted mute
> leds. Completely remove this quirk and its documentation.
>
> Signed-off-by: Gustavo Maciel Dias Vieira <gustavo@sagui.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> Signed-off-by: James M Leddy <james.leddy@canonical.com>

Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

> ---
>  Documentation/sound/alsa/HD-Audio-Models.txt |    1 -
>  sound/pci/hda/patch_sigmatel.c               |    4 ----
>  2 files changed, 5 deletions(-)
>
> diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
> index 69820b2..b8051f1 100644
> --- a/Documentation/sound/alsa/HD-Audio-Models.txt
> +++ b/Documentation/sound/alsa/HD-Audio-Models.txt
> @@ -351,7 +351,6 @@ STAC92HD83*
>    mic-ref	Reference board with power management for ports
>    dell-s14	Dell laptop
>    dell-vostro-3500	Dell Vostro 3500 laptop
> -  hp		HP laptops with (inverted) mute-LED
>    hp-dv7-4000	HP dv-7 4000
>    auto		BIOS setup (default)
>  
> diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
> index 1db6654..077d0c1 100644
> --- a/sound/pci/hda/patch_sigmatel.c
> +++ b/sound/pci/hda/patch_sigmatel.c
> @@ -97,7 +97,6 @@ enum {
>  	STAC_92HD83XXX_PWR_REF,
>  	STAC_DELL_S14,
>  	STAC_DELL_VOSTRO_3500,
> -	STAC_92HD83XXX_HP,
>  	STAC_92HD83XXX_HP_cNB11_INTQUAD,
>  	STAC_HP_DV7_4000,
>  	STAC_92HD83XXX_MODELS
> @@ -1658,7 +1657,6 @@ static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
>  	[STAC_92HD83XXX_PWR_REF] = "mic-ref",
>  	[STAC_DELL_S14] = "dell-s14",
>  	[STAC_DELL_VOSTRO_3500] = "dell-vostro-3500",
> -	[STAC_92HD83XXX_HP] = "hp",
>  	[STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad",
>  	[STAC_HP_DV7_4000] = "hp-dv7-4000",
>  };
> @@ -1673,8 +1671,6 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
>  		      "unknown Dell", STAC_DELL_S14),
>  	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x1028,
>  		      "Dell Vostro 3500", STAC_DELL_VOSTRO_3500),
> -	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,
> -			  "HP", STAC_92HD83XXX_HP),
>  	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656,
>  			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
>  	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1657,
Tim Gardner - March 14, 2013, 2:31 p.m.

Patch

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 69820b2..b8051f1 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -351,7 +351,6 @@  STAC92HD83*
   mic-ref	Reference board with power management for ports
   dell-s14	Dell laptop
   dell-vostro-3500	Dell Vostro 3500 laptop
-  hp		HP laptops with (inverted) mute-LED
   hp-dv7-4000	HP dv-7 4000
   auto		BIOS setup (default)
 
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 1db6654..077d0c1 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -97,7 +97,6 @@  enum {
 	STAC_92HD83XXX_PWR_REF,
 	STAC_DELL_S14,
 	STAC_DELL_VOSTRO_3500,
-	STAC_92HD83XXX_HP,
 	STAC_92HD83XXX_HP_cNB11_INTQUAD,
 	STAC_HP_DV7_4000,
 	STAC_92HD83XXX_MODELS
@@ -1658,7 +1657,6 @@  static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
 	[STAC_92HD83XXX_PWR_REF] = "mic-ref",
 	[STAC_DELL_S14] = "dell-s14",
 	[STAC_DELL_VOSTRO_3500] = "dell-vostro-3500",
-	[STAC_92HD83XXX_HP] = "hp",
 	[STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad",
 	[STAC_HP_DV7_4000] = "hp-dv7-4000",
 };
@@ -1673,8 +1671,6 @@  static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
 		      "unknown Dell", STAC_DELL_S14),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x1028,
 		      "Dell Vostro 3500", STAC_DELL_VOSTRO_3500),
-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,
-			  "HP", STAC_92HD83XXX_HP),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656,
 			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1657,