Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp415680pxj; Thu, 20 May 2021 12:17:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8fW0ZL5c8cWGM5CyGex2XvZynZZSFKyD/Nf8JkgFa4EbYH/vRlHv/52OufOtwOhnNyVl5 X-Received: by 2002:a50:9f6b:: with SMTP id b98mr6706376edf.318.1621538257342; Thu, 20 May 2021 12:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621538257; cv=none; d=google.com; s=arc-20160816; b=erDcatWDYLvfKlf86/3jkN6gplnK70poCb1pyujwgGWsMlVPvocqigl+ipdHfvdbT5 ElVTYYbtFtgPS42NIysPGvgmq5O4v2BNTn8lJ9DLiziny082K+hHevGd101HsWZNvO1/ ZWo548QTZ3wrIFAPgwiRn6gEGTG+qjAbEbCK/BLxYkXZoPoIxtxE3PUUEVyUDT7g8EPa meBup0mYvGneJRZHlydLQgtwTgMFOa8He/Q8FMtyhOJXs6CM2bYZ3s/TFtrVKzXzMnER 5PYWosqviCnQb6SUrMWZmlYGHW0nmKX9dEo67oezZNyZQFS+lLYfy1JNn+AXGtkbWycQ 1jYw== 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=VuE5/PmaorsXuUp3qhS3h1fVAbDSAkr4XAI2qiO89cI=; b=ZMYr86hawzqpVxiKwousvJUZ17D/Y+eAqBMRuViKQY53il8VZopMdto3Sz1HKiby7N 4eAnxlobeS5jcs1DsclNosxNzh7IcJt18+P8hekQiYGT17l/HWKkwCG5axTE/TceA1ya AMx+XffeVzGPnMlkZNlD3tHKnIPtcUB2+X0khiUvTuevCb8jkXL0RT8zO1n2RwB1IjBC PxWacx/cd/Ki9C4ul1CooZuUWroZeQ1qXhLs6huk+yy7ZXSA4lTU0B4oKLCAWqnDQ2nj CDwZThf+iGkoBoJxN1IxfvkUFWx5AFGl+0J9s/wdG91ZMLhnOgE9GMf6lYJRtjgUe3nR hrKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="cpp/fIiE"; 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 s20si3226062ejb.555.2021.05.20.12.17.13; Thu, 20 May 2021 12:17: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="cpp/fIiE"; 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 S237491AbhETKnm (ORCPT + 99 others); Thu, 20 May 2021 06:43:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:58206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236845AbhETK2i (ORCPT ); Thu, 20 May 2021 06:28:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7FDA261490; Thu, 20 May 2021 09:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504264; bh=twIY2PzYrB69Sa89DIlRy28ufoqRyuAKUxHUF87mqls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpp/fIiEu9RVbLwSheVqPlGv/5y2+Or0ZLD3v9VqCmRhtGMo4MlHBlsRs/+XVs7dl mEqfGhYCifSAynKemspKtVSNZO6Tdlt7QakidKN++yae37LJQY8jVLN8eg9hdDbUBy 2XUx052bcJqsR1MZFEMkmjnBBzMqGI2TUP5HMGQ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.14 132/323] ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices Date: Thu, 20 May 2021 11:20:24 +0200 Message-Id: <20210520092124.632176867@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@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 @@ -7470,8 +7470,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), {} };