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 EB45CC25B07 for ; Mon, 8 Aug 2022 01:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243205AbiHHBtV (ORCPT ); Sun, 7 Aug 2022 21:49:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243172AbiHHBsb (ORCPT ); Sun, 7 Aug 2022 21:48:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA92417055; Sun, 7 Aug 2022 18:37:12 -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 ams.source.kernel.org (Postfix) with ESMTPS id 0DD15B80E10; Mon, 8 Aug 2022 01:37:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBA41C433C1; Mon, 8 Aug 2022 01:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922629; bh=ejPkYE+QF/MzjN6IdgvCaZYHYtVR1hmg8AO+nCLXFmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gcMyvssQGJT2CkKjZferlarP7slonmvLEwsTnmcvKQe2ZKCfgqIRee7tBxZTgjCqJ JqTMxbuf4gCk48iI+BuXpvtEWHddh5hASr/R3ITi2mO8LDf9Hco76g7kS1wwfgliCF sCEvgIsk8Bk0OAbQx7zm7JllyC1oDUOI7pdtIjTNCLA8z9EHG3MWbU38IJNqECW7Ov Kk7Lmdg75Od/EIeP5lSElh7RpTaSAe7OtPmggx9cMt4jymW0SU8DFUZmHEb5LyK604 mXWHtvSa9GXkGsdbomE88EldKmiNQ03IKuq6NKFDLBoZ0lSWNeDyf+po2YXtrm2Pqh BiFfTOyDihoJg== 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.15 30/45] ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks Date: Sun, 7 Aug 2022 21:35:34 -0400 Message-Id: <20220808013551.315446-30-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013551.315446-1-sashal@kernel.org> References: <20220808013551.315446-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 9b859ff976e8..d41fa0f3a1ac 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -2167,13 +2167,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