From patchwork Mon Jun 20 09:25:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 583654 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 D7B65C43334 for ; Mon, 20 Jun 2022 09:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240669AbiFTJ0J (ORCPT ); Mon, 20 Jun 2022 05:26:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240672AbiFTJ0H (ORCPT ); Mon, 20 Jun 2022 05:26:07 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7C03B13CC7 for ; Mon, 20 Jun 2022 02:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655717165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AcvUFSupe0engOuKx44cX/USi9NU/JfKUbfGrvsEnQM=; b=eHpCxyZZc/bQFG92A0U+6Bk49bvm0QJdUg4KaMxmqk1XS/ORDnijZha2xqytdUyukWuVr0 8DspWyxqf43friSRMfp8nzBJ8Un55uRfE/aOGUClrp7YwOti4O6PY62PZ2rbI8FK1MuVBf 8aZb5MpuAhhnRC5b3N3LXDlKkKB2L6w= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-GsWXs3nrNwayYLe3OX3TAg-1; Mon, 20 Jun 2022 05:26:00 -0400 X-MC-Unique: GsWXs3nrNwayYLe3OX3TAg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 834AE1C05EA7; Mon, 20 Jun 2022 09:25:59 +0000 (UTC) Received: from x1.nl (unknown [10.39.195.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55AEE1410DD8; Mon, 20 Jun 2022 09:25:57 +0000 (UTC) From: Hans de Goede To: "Rafael J . Wysocki" , Len Brown , Robert Moore , Mika Westerberg Cc: Hans de Goede , Zhang Rui , Andy Shevchenko , kai.heng.feng@canonical.com, linux-acpi@vger.kernel.org, devel@acpica.org Subject: [PATCH 1/4] ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks Date: Mon, 20 Jun 2022 11:25:43 +0200 Message-Id: <20220620092546.8298-2-hdegoede@redhat.com> In-Reply-To: <20220620092546.8298-1-hdegoede@redhat.com> References: <20220620092546.8298-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- drivers/acpi/ec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index cd86e68d6b98..2efbecb342b2 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -2225,13 +2225,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 = {