ALSA: hda - Make the ALC269 pin quirk table shorter

...by factoring out common parts to the just added pin macros.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c7d65f0..cbc4d25 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5042,37 +5042,25 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
 
 static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x40300000},
                {0x14, 0x90170110},
                {0x17, 0x411111f0},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x02a11030},
                {0x1d, 0x40538029},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211020}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x90a60140},
                {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40700001},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211020}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x90a60160},
                {0x14, 0x90170120},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40700001},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211030}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                {0x12, 0x90a60160},
@@ -5086,48 +5074,32 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                {0x1e, 0x411111f0},
                {0x21, 0x0321102f}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x90a60160},
                {0x14, 0x90170130},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40700001},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211040}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x90a60160},
                {0x14, 0x90170140},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40700001},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211050}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x90a60170},
                {0x14, 0x90170120},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40700001},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211030}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC255_STANDARD_PINS,
                {0x12, 0x90a60170},
                {0x14, 0x90170130},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40700001},
-               {0x1e, 0x411111f0},
                {0x21, 0x02211040}),
        SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED,
                {0x12, 0x90a60140},
@@ -5143,92 +5115,60 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                {0x1d, 0x40700001},
                {0x1e, 0x411111f0}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP 15 Touchsmart", ALC269_FIXUP_HP_MUTE_LED_MIC1,
+               ALC282_STANDARD_PINS,
                {0x12, 0x99a30130},
-               {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
                {0x19, 0x03a11020},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40f41905},
-               {0x1e, 0x411111f0},
                {0x21, 0x0321101f}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
+               ALC282_STANDARD_PINS,
                {0x12, 0x99a30130},
-               {0x14, 0x90170110},
                {0x17, 0x40020008},
-               {0x18, 0x411111f0},
                {0x19, 0x03a11020},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40e00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x03211040}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
+               ALC282_STANDARD_PINS,
                {0x12, 0x99a30130},
-               {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
                {0x19, 0x03a11030},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40e00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x03211020}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
+               ALC282_STANDARD_PINS,
                {0x12, 0x99a30130},
-               {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
                {0x19, 0x03a11030},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40f00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x03211020}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
+               ALC282_STANDARD_PINS,
                {0x12, 0x99a30130},
-               {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
                {0x19, 0x04a11020},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40f00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x0421101f}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
+               ALC282_STANDARD_PINS,
                {0x12, 0x99a30130},
-               {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
                {0x19, 0x03a11030},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40f00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x04211020}),
        SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED,
+               ALC282_STANDARD_PINS,
                {0x12, 0x90a60140},
-               {0x14, 0x90170110},
                {0x17, 0x40000000},
-               {0x18, 0x411111f0},
                {0x19, 0x04a11030},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40f00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x04211020}),
        SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC282_STANDARD_PINS,
                {0x12, 0x90a60130},
-               {0x14, 0x90170110},
                {0x17, 0x40020008},
-               {0x18, 0x411111f0},
                {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40e00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x0321101f}),
        SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
                {0x12, 0x90a60160},
@@ -5242,167 +5182,96 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                {0x1e, 0x411111f0},
                {0x21, 0x02211030}),
        SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC282_STANDARD_PINS,
                {0x12, 0x90a60130},
-               {0x14, 0x90170110},
                {0x17, 0x40020008},
-               {0x18, 0x411111f0},
                {0x19, 0x03a11020},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
                {0x1d, 0x40e00001},
-               {0x1e, 0x411111f0},
                {0x21, 0x0321101f}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x411111f0},
                {0x15, 0x04211040},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x90170112},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11020},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4075812d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4075812d}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x411111f0},
                {0x15, 0x04211040},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x90170110},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11020},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4075812d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4075812d}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x411111f0},
                {0x15, 0x0421101f},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11020},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4075812d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4075812d}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x411111f0},
                {0x15, 0x04211020},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11040},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4076a12d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4076a12d}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x90170110},
                {0x15, 0x04211020},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11040},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4076a12d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4076a12d}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x90170110},
                {0x15, 0x04211020},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11020},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4076a12d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4076a12d}),
        SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
-               {0x12, 0x99a30130},
-               {0x13, 0x40000000},
+               ALC290_STANDARD_PINS,
                {0x14, 0x90170110},
                {0x15, 0x0421101f},
-               {0x16, 0x411111f0},
-               {0x17, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
                {0x1a, 0x04a11020},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x4075812d},
-               {0x1e, 0x411111f0}),
+               {0x1d, 0x4075812d}),
        SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,
+               ALC292_STANDARD_PINS,
                {0x12, 0x90a60140},
                {0x13, 0x411111f0},
-               {0x14, 0x90170110},
-               {0x15, 0x0221401f},
                {0x16, 0x01014020},
                {0x18, 0x411111f0},
-               {0x19, 0x01a19030},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x40700001},
-               {0x1e, 0x411111f0}),
+               {0x19, 0x01a19030}),
        SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,
+               ALC292_STANDARD_PINS,
                {0x12, 0x90a60140},
                {0x13, 0x411111f0},
-               {0x14, 0x90170110},
-               {0x15, 0x0221401f},
                {0x16, 0x01014020},
                {0x18, 0x02a19031},
-               {0x19, 0x01a1903e},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x40700001},
-               {0x1e, 0x411111f0}),
+               {0x19, 0x01a1903e}),
        SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
+               ALC292_STANDARD_PINS,
                {0x12, 0x90a60140},
                {0x13, 0x411111f0},
-               {0x14, 0x90170110},
-               {0x15, 0x0221401f},
                {0x16, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x40700001},
-               {0x1e, 0x411111f0}),
+               {0x19, 0x411111f0}),
        SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC292_STANDARD_PINS,
                {0x12, 0x40000000},
                {0x13, 0x90a60140},
-               {0x14, 0x90170110},
-               {0x15, 0x0221401f},
                {0x16, 0x21014020},
                {0x18, 0x411111f0},
-               {0x19, 0x21a19030},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x40700001},
-               {0x1e, 0x411111f0}),
+               {0x19, 0x21a19030}),
        SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
+               ALC292_STANDARD_PINS,
                {0x12, 0x40000000},
                {0x13, 0x90a60140},
-               {0x14, 0x90170110},
-               {0x15, 0x0221401f},
                {0x16, 0x411111f0},
                {0x18, 0x411111f0},
-               {0x19, 0x411111f0},
-               {0x1a, 0x411111f0},
-               {0x1b, 0x411111f0},
-               {0x1d, 0x40700001},
-               {0x1e, 0x411111f0}),
+               {0x19, 0x411111f0}),
        {}
 };