Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4644925pxj; Wed, 12 May 2021 09:57:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHiSkslxp3ovGroRD3TAfXSyTyruLQevCuM7SY9ZV0OOnJvEVQDrpsKk6KpBTq14t3aZZ9 X-Received: by 2002:a17:906:1110:: with SMTP id h16mr22174705eja.530.1620838658843; Wed, 12 May 2021 09:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620838658; cv=none; d=google.com; s=arc-20160816; b=zexQwWJm14/O+sGzF++LpFZtGaSXAuGh92LE8jQdBM2hHONjRTV5zbN/7mZ55MKX39 kBYQa15C+NgBajDu0WHk1vNFTONbRiAha8ie8TfqCcQhQ4x1yNupLUnEr+YYTNKU1pl1 2xcpZhlpBPJRfnsKInxq6hT/0+wJejZG3SKXzTEiiOZoipXIxF2sOAw7w1NSQLiUl2iu jpuyyTLpXy5SMOzQawEFAb5CbraDtW7XFJ1id5UiQ4rGL/tlSJ+KsgbexNIRuPPFRFKR S67YZZ2byA2034Pw+OcU+9W44Ywqw9OcIQArk5hBCJICGoo4vkDBbTtXWU8ZyaPN/m/g U74g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iqUhcMMUVARhIBZMfUlXlsIvrHzBrOaBSjZCul/vwjs=; b=T/bUSdUpcFfLWYMF4eG9pcANcT4huGjkWYnHtnrAW/a7DTV+qnD1T+rXoXfhV+Y4uV vvDIXC2S4G/mMlK+/wlI7zh4OBe8KHlHcUwN6mYs3mTl+V0I+fgEPtYTtosyxeAfsgGj XWjct54LDqMOx5A3tura/ncr8LmQCR0eH/WEuQoyPU0R6mXM5u5c3IU3Lc83pbmgYT3i xAm6Peq/c9BGn/uJ+p4XHp/3jlBgr+NDa+auKKyeY4R6KPC9nsfvCGlB0xDE8QYwwjFL 8AzL7z7iwx9ncuYuq3Yc+SVq+5qdqYpJokSv1AtiTctJLD1UBnpldVkyE6cNqVoZki+V S4Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aHaK6K6k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t15si609224ejx.9.2021.05.12.09.57.15; Wed, 12 May 2021 09:57:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aHaK6K6k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238979AbhELQ51 (ORCPT + 99 others); Wed, 12 May 2021 12:57:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:35232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236803AbhELPzc (ORCPT ); Wed, 12 May 2021 11:55:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9A2B86188B; Wed, 12 May 2021 15:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620833279; bh=Dn2GJrPQAk32CSwPc9qvjxClhJVmUnUDsO5iDFLUnJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aHaK6K6k/AwA/3vtdurxaVKvmcHnAJW1HEuU4TZpA49repdZ1Zx1veT9Fz8xOMSCF Tkfx2JF02DsWYV7yRTieAAof5DjLDg3OUG+lZxR/0J7Nlv7cV+0erKB+YKIwUExvy2 BrCZ2B5y6LeLqIdIRI6deZA7/BTcvEWlRWT3Pi8U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.11 086/601] ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices Date: Wed, 12 May 2021 16:42:43 +0200 Message-Id: <20210512144830.656246230@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai commit defce244b01ee12534910a4544e11be5eb927d25 upstream. The quirk entry for Uniwill ECS M31EI is with the PCI SSID device 0, which means matching with all. That is, it's essentially equivalent with SND_PCI_QUIRK_VENDOR(0x1584), which also matches with the previous entry for Haier W18 applying the very same quirk. Let's unify them with the single vendor-quirk entry. Cc: Link: https://lore.kernel.org/r/20210428112704.23967-13-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_realtek.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9264,8 +9264,7 @@ static const struct snd_pci_quirk alc861 SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", ALC861_FIXUP_ASUS_A6RP), SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", ALC861_FIXUP_AMP_VREF_0F), SND_PCI_QUIRK(0x1462, 0x7254, "HP DX2200", ALC861_FIXUP_NO_JACK_DETECT), - SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", ALC861_FIXUP_AMP_VREF_0F), - SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", ALC861_FIXUP_AMP_VREF_0F), + SND_PCI_QUIRK_VENDOR(0x1584, "Haier/Uniwill", ALC861_FIXUP_AMP_VREF_0F), SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", ALC861_FIXUP_FSC_AMILO_PI1505), {} };