diff mbox series

[2/2,SRU,OEM-B] Revert "UBUNTU: SAUCE: ALSA: hda - don't forcibly resume the codec on two DELL machines"

Message ID 20200323025148.29201-3-acelan.kao@canonical.com
State Accepted
Headers show
Series Dell OptiPlex 7070 Ultra can detect external mic after S3 | expand

Commit Message

AceLan Kao March 23, 2020, 2:51 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1868510

This reverts commit 7c6fd532f7b6acc6d2d09596f706f20e5eae1de9.

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 14 --------------
 1 file changed, 14 deletions(-)
diff mbox series

Patch

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 54cdcea5e836..dcf43af55f46 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -560,13 +560,6 @@  static void alc_fixup_sku_ignore(struct hda_codec *codec,
 	}
 }
 
-static void alc_fixup_skip_force_resume(struct hda_codec *codec,
-					const struct hda_fixup *fix, int action)
-{
-	if (action == HDA_FIXUP_ACT_PRE_PROBE)
-		codec->relaxed_resume = 1;
-}
-
 static void alc_fixup_no_depop_delay(struct hda_codec *codec,
 				    const struct hda_fixup *fix, int action)
 {
@@ -5802,7 +5795,6 @@  enum {
 	ALC299_FIXUP_PREDATOR_SPK,
 	ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
 	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
-	ALC256_FIXUP_SKIP_FORCE_RESUME,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -6841,10 +6833,6 @@  static const struct hda_fixup alc269_fixups[] = {
 			{ }
 		}
 	},
-	[ALC256_FIXUP_SKIP_FORCE_RESUME] = {
-		.type = HDA_FIXUP_FUNC,
-		.v.func = alc_fixup_skip_force_resume,
-	},
 	[ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC] = {
 		.type = HDA_FIXUP_PINS,
 		.v.pins = (const struct hda_pintbl[]) {
@@ -6934,9 +6922,7 @@  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),
 	SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),
-	SND_PCI_QUIRK(0x1028, 0x091b, "Dell", ALC256_FIXUP_SKIP_FORCE_RESUME),
 	SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
-	SND_PCI_QUIRK(0x1028, 0x097f, "Dell", ALC256_FIXUP_SKIP_FORCE_RESUME),
 	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),