Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp544639pxj; Thu, 20 May 2021 15:50:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMBEdRiDhVMFF4GqqApZ8uS5GwuUXJgka97Xbjl9P0vd29wH4KPiVWobuMjb8xvZyrymPO X-Received: by 2002:a02:a10f:: with SMTP id f15mr9231098jag.124.1621551037426; Thu, 20 May 2021 15:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621551037; cv=none; d=google.com; s=arc-20160816; b=DXdEjwrSy+EtoU3eFyHh/bHIoNSVb8DVT1bgsklDgG5PpNuczLPpFYJtTHfOirNQpN CMITPFGiLBfa+4jImpG9/6FdhuljJRBJ1PiXH1hOAk6bhUJyMRNXah2QGMgfjrHfCyRl H2ik1xBcIdMPeBjG71KN1RaonPiK9U4aiT7/l+RqBmplsEyZTi8TV3QAxoglxrnkyMn6 vDtWR5iKwMMXKx9TaLicD2NMP52DU/fpF99AK7CJl8eN34N1E7fn1po7zTavlaUqFtJs 618+cVySRq0e5sTk8+haiEsKBpWqIhbBjNLmhv8T7N4P2SEpRRe+6duOcU9mqlklqPK7 xNvQ== 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=BOkwtAfMx54w7m8aa6MoViwXhm8wxrGjK5hOY9dqQzc=; b=LoHpHaRGPxYQdhMebONo9Ho+Ky6DvtN4MSAeLoPmvPz1499RlMrH6QJmmGNeHyqMfw 8z+WT20RoPMFkhA/00suS+x2toNF+OEo693esPTU6hRg6acivZ7IuMsVWiAe7mgbSv3r LUkB75ZFt6kXqQEgxHhLqbTni3qAZS+3qkrQQZV+AWisBSKHALf8QegE3yZNtHEYItJp soDz+w1tm874IFGwf5Kmlptwkf3ISoDTHmjerKrUD4mPQStZ8t8bkhiFg4LrEGrHnpi7 g5y+rHx/JZxMvd+C7OBm7Fufd4E16UW+hPLa4OKsrx9qQxpjj3ZreRDariTH9OvV9h+N doQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Gp8PgfUy; 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 s18si3812883ilh.102.2021.05.20.15.50.23; Thu, 20 May 2021 15:50:37 -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=Gp8PgfUy; 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 S239846AbhETLLy (ORCPT + 99 others); Thu, 20 May 2021 07:11:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:52442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239124AbhETKwI (ORCPT ); Thu, 20 May 2021 06:52:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B697F61CCF; Thu, 20 May 2021 10:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504809; bh=WoDTxdOCmMpfVOe2GSiTmB+VzRbhHne3yY7EOD5085c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gp8PgfUykdqxJcaDYhtl6Fvw/4R97+0XtBU86e7aWQxbs54x6rUWIOsVFYQJMWO1O LVSSZ6ZG3EddbwsO3mnqRwpqGppNNlZsz25S7QqBtpewSDIve1vEZXGRyIi3S9J8WY NiplBaakJRKaeNAG42/YoqS9oMoJMA4zQt8gmx7g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.9 090/240] ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices Date: Thu, 20 May 2021 11:21:22 +0200 Message-Id: <20210520092111.702580269@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092108.587553970@linuxfoundation.org> References: <20210520092108.587553970@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 @@ -6569,8 +6569,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), {} };