Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp64185pxj; Thu, 20 May 2021 04:40:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwa6eoW3tHTWbVCjwYy+4CsZfN7YVrc59ZVKmf8C39HFmwOGuyWcVv0iRROqtVdN5pBmSyH X-Received: by 2002:a17:906:2a46:: with SMTP id k6mr4103472eje.406.1621510814706; Thu, 20 May 2021 04:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621510814; cv=none; d=google.com; s=arc-20160816; b=vnr9M/GmEVozDpLGoecOX07ikIXiH5Slq65c7jNAIzpHrqfjMLhEGTDyaKrWAhFd8A aTTGzBj/+gT3ouREun8NulPs5VWCxT4EO4j3zXM8MTeacSKuu4m/+qcr9T/BOI2WKjBE VJgOTgzLyFMHz9EY4XUcLIXeiLt2WW8CzqK4xWiSqwpat6zeDPd2CIR0q915qdIQo2X/ UwZ8q9MsShKgSzqV+4efq4Ogdsl5qUVs6FyTrT3TEe3jfw9q6K5Za62NRXrHR1mCxGwb p3sbOKjbAclMiz1/bgXJJ+Y0i4MCWCf/z7xvE7DZ5MW4nHy8qum/CGe/uHHA3lCAWhv+ QB7Q== 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=NfyONj9h/mUYcYd3uCkbOqGJ0Y1qp2oCyH/iGmdKbQI=; b=d7jDKbFkkd6l96Te4YkvwsvFnqBLlcUklQVAlCTPeBjMvtDL6wwkKV3/N0B3VI/XFl Co8TGA8Aftz2hEYlajULPrRddD+gms4fEjWMXsrcJhgwHNecQzr25eDyaoulMzIa4ITu l6C/FMSupGiUsbJm+d5G6CCr/N+dTKhE7lWMXaqnamd/6fbD9ExG1NVp0/QghTrpNYGq CjLx+MoQ6RjGWtzP3Ze3eNMnbzz3wtKeSsUFZw9QprfSp7ZP9xKJJ72UxPFJk+IjIm7i 7HwqzJV8i8j8BS4PfaQP5GsO5ybvY7ZbjknMB4XjoFNNxKNIhVxrbpftvR+d1yK+OVgw XXYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=d7mtgoQK; 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 w6si156888edd.217.2021.05.20.04.39.51; Thu, 20 May 2021 04:40:14 -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=d7mtgoQK; 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 S242262AbhETLfO (ORCPT + 99 others); Thu, 20 May 2021 07:35:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:36532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240468AbhETLOf (ORCPT ); Thu, 20 May 2021 07:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 796FF6143C; Thu, 20 May 2021 10:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505317; bh=PBszH3nyknngbHgL+4vQ+RG+36b51WSbHmeGyeIRi5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d7mtgoQKJanEP0wp7Ghl2yk1IheaiS7OkXZ+wI63+ro6x7P3zJ4OqoP6SsHwxK8uu aEQVyDiEiQq59tfpAv8Eo2NsiZRk15lx4s5/F9YX5SCIr0oGqFBy78y3CAcxmccOQ4 eZPOflimiZVhpFpj2umzzddi019Gal2/nrhBbc90= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.4 073/190] ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices Date: Thu, 20 May 2021 11:22:17 +0200 Message-Id: <20210520092104.598770461@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092102.149300807@linuxfoundation.org> References: <20210520092102.149300807@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 @@ -6491,8 +6491,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), {} };