From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 27 Dec 2017 08:03:45 +0000 (+0100)
Subject: ALSA: hda - Clean up ALC299 init code
X-Git-Tag: v4.19~1776^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1350bff69d13369c3316f5d5e580021c2196f90;p=platform%2Fkernel%2Flinux-rpi.git

ALSA: hda - Clean up ALC299 init code

ALC299 is compatible with ALC225/295, thus it doesn't have to assign
its own model.  Merge together with ALC225/295 code.

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 8fd2d9c..b203713 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6923,12 +6923,9 @@ static int patch_alc269(struct hda_codec *codec)
 		break;
 	case 0x10ec0225:
 	case 0x10ec0295:
-		spec->codec_variant = ALC269_TYPE_ALC225;
-		spec->gen.mixer_nid = 0; /* no loopback on ALC225 ALC295 */
-		break;
 	case 0x10ec0299:
 		spec->codec_variant = ALC269_TYPE_ALC225;
-		spec->gen.mixer_nid = 0; /* no loopback on ALC299 */
+		spec->gen.mixer_nid = 0; /* no loopback on ALC225, ALC295 and ALC299 */
 		break;
 	case 0x10ec0234:
 	case 0x10ec0274: