Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4547068pxj; Wed, 12 May 2021 07:58:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVKXSYFPjMy/kmY3BJkRtGuYvGS2OjjoODHVWAMBgBMRhYbZD5rJ6anPlr+Xfk3EhqIW+K X-Received: by 2002:adf:f508:: with SMTP id q8mr46326478wro.109.1620831490631; Wed, 12 May 2021 07:58:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620831490; cv=none; d=google.com; s=arc-20160816; b=TyARlrD+NmmJq0kRP+SEH3/W3FGMyJvUjOurCdscWqWTfHaKbEjwxS9prduFhI5iHA ybzxSPljQLqdyc/X+AeeRb8ZuNcBo5ZeWX2AkVzoZp/yPbI3CpLyW8i3OBOrZ4werKQq qr03gXbJFTdfteHF8Itz2mEoandW0AHvmUzhj8ZcMsEIqevHuBoJrg7dlHj8dx75ABOU h7DdU/HTwNbxsVO3+Rzjbzz/re3TCuXiiYrs4LrYNtVPFmC+K1qpsDms2+vYPan+tliZ Elqv9y78++XRVBrdS2HbEdtYSEssDIW22/TA6xU2By1tRg+OclT/bthdLkcLRgY4rL8W aU1g== 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=rNv4VG83UOavlGqDdOaXiskFfPigeB+Ta6tFrnZXxto=; b=s63CkDLcPVtJLW2gQwW3JRcAyw76dnY3UNdzumlhnqvHG7tQv/aMOdudKlAG4gJs+G WRnoW20Sb0kw0l7gb1tpCZMxhJ//s8M+zl6AzRVxG/UVA6RI1OCFL3fq+t6OnVw2AA/b osfVkkrLqJcJ5wuPSNCIIkPr6WuZMbGp7tU93OUiQWQJbB7KgfNv+Vn7QsswEi5JIHtG TCCeHhm7okX4F8dFz+B8aVmzUYnFyOZickKNTikogWMMpR8jSUPDcSKH3fYY1bokrSAA bJZFGfICbhcIDXRl6TyWHOVDg0vXS+tkWyq97+FKsoHDkipZOsueIrW2LTux6AO2o13j 1+4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DySQUvYY; 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 r12si768775wmq.5.2021.05.12.07.57.46; Wed, 12 May 2021 07:58:10 -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=DySQUvYY; 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 S232265AbhELO5K (ORCPT + 99 others); Wed, 12 May 2021 10:57:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:46434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231776AbhELOzl (ORCPT ); Wed, 12 May 2021 10:55:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1D65D6143B; Wed, 12 May 2021 14:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620831273; bh=JTrFYSsC5haewjzAXnCR3r8DO1NbeALdtUpeuASFmBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DySQUvYY2ujRYClLQsVxXmRbhHLMYKPGNEe0LHLDoyMO3GRHQhV3ZKRw9j4CwuPDp R7t6yEt6fDMiDO2d8SAlCLMGpVUkzwQisoP6aoStkjE+ussXFkQgGiuF1UKNEFHxY/ FiD+ixWP4RMVJEI7iX1JcAw2XQ0MYWiZan3RRZ5c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.4 054/244] ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices Date: Wed, 12 May 2021 16:47:05 +0200 Message-Id: <20210512144744.777609834@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144743.039977287@linuxfoundation.org> References: <20210512144743.039977287@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 @@ -9084,8 +9084,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), {} };