From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 359A3C3F6B0 for ; Mon, 8 Aug 2022 01:52:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243333AbiHHBwe (ORCPT ); Sun, 7 Aug 2022 21:52:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243560AbiHHBvR (ORCPT ); Sun, 7 Aug 2022 21:51:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C1B4DE80; Sun, 7 Aug 2022 18:38:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 305BD60E06; Mon, 8 Aug 2022 01:38:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE372C433D7; Mon, 8 Aug 2022 01:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922693; bh=sufOGxxRGzcDul6F7ze451RApth6tJw02w1Y1Ksf4ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u9ZZldJsu+zaOe06SwqPk2gf0UDrLT/OBYQemNCDr757o52DV8psXAx5l+XZDtFnO tr8xWnFKxTrw81XiGm01koFoH7nPBgYvLskg4NMtL028CDVhtDINl+j6owmY9SQQ6G 6GHAHXm33kl9pzydl6gMNXt77pe4RJ+fT6UBDSjAGhxSFAf0XbaV/TmSEnb+Psapqn ZaO2/JPMkH5H4xvlSSx3vuB7X981i9lCuTLc8Pyp72Ao+UE3/nuQ+k//njlfqH7vvb 9WXOOl8HJ5DtQ54T9CHd9ZpqfQq7oBJ+Rxe9Uuw7CEJdh+nxi47bcf13AYgcH9ZhtU V4l9ebDQ21EIA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 19/29] ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks Date: Sun, 7 Aug 2022 21:37:29 -0400 Message-Id: <20220808013741.316026-19-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013741.316026-1-sashal@kernel.org> References: <20220808013741.316026-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Hans de Goede [ Upstream commit 0dd6db359e5f206cbf1dd1fd40dd211588cd2725 ] Somehow the "ThinkPad X1 Carbon 6th" entry ended up twice in the struct dmi_system_id acpi_ec_no_wakeup[] array. Remove one of the entries. Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/ec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 3f2e5ea9ab6b..7305cfc8e146 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -2180,13 +2180,6 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = { DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"), }, }, - { - .ident = "ThinkPad X1 Carbon 6th", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Carbon 6th"), - }, - }, { .ident = "ThinkPad X1 Yoga 3rd", .matches = { -- 2.35.1