From patchwork Mon Jul 3 12:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp487966vqx; Mon, 3 Jul 2023 05:35:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlEOS/JTOgcr+6ihqI6Q+yMC9lGLHgI5eFdjivKUwxgC0Au+c6MESo6jqdjmFUzOPl2Cxlqh X-Received: by 2002:a17:90b:24d:b0:263:1e82:2dc7 with SMTP id fz13-20020a17090b024d00b002631e822dc7mr11569215pjb.0.1688387752115; Mon, 03 Jul 2023 05:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688387752; cv=none; d=google.com; s=arc-20160816; b=1Jiajt9tPqzY4+Vp0TdCsblQY9aHdhZgU3XXo3skWJGacZX2/WjPmfu7gdIom7RId2 zg1CF6WaifeCbAmQnOw/l0vstcB20GqYm1jKQT8BTwBFHTYZeGxN2jRc2a0PZcQHfOzh nHSn1WTnBEoOV0l502yCqJkgMr92HwJ5THe589ZVUu7z/WNQG0XcUXND7otP0YXOyx8g 2QUQf3DKawD2HbMwW0mIpjwSYSRO9XvBtpM1CYKsqGz2QiYOKpKgHowuhgZ99nSMIGpc aiKkssmqYUfgjBKSZ5FeKb1I2DlA6w7hTnHcD11Al1jlFOpcR0qX8dHN+X83CoX56baR bpMA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GPrtuCl/amqaNY9mbMAVD3ENJ2c/ANutpwvCXJbGFR8=; fh=z41p7sb2mQHDU0cDatvZvSvBt/K/qZ0WnYN8eOL4by8=; b=zgbipljCQWGMei0CpM1Fm0t7pzS1rVjb4y2X8SKLS8yCioajDR3NXG0cmLRKqwGfwr t6gZXy46WwLbLDNbYD6DwxV63csDiPV6ioX+NpTHqOBKNiy5vxVLz3S2/XdkgVhWJcXX PxbgLYZaQ1qp5vrrQNj2FfZfYWYLrSGGigxyQHVpGAbHDkQ6koR7HiQnLBKMYbfQMlM/ g0jO2MS3ErNFX+KVzrQRexj1bDJGPWMWgeuYwcOUoHCw7CTfB5KtBmCiIqOU0mGBX43Y 8nCYJrAI3YJoRGQWxaiEp5dXueCBdes0VBsf9THYOeAsaoP6+bF9hNeWVj59Hyu4OAMo 1XJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NgWm81nl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m8-20020a17090a4d8800b00263131a650bsi12656236pjh.77.2023.07.03.05.35.39; Mon, 03 Jul 2023 05:35:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NgWm81nl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbjGCMOR (ORCPT + 99 others); Mon, 3 Jul 2023 08:14:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjGCMOP (ORCPT ); Mon, 3 Jul 2023 08:14:15 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48480115; Mon, 3 Jul 2023 05:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688386454; x=1719922454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z7bCMN6xKQi+ypGD5LL1aECtFx/TCb2DP0kRtZYvV10=; b=NgWm81nllrMuJmp/bRu/UKkw/UVojjh3HHK7yCFnShWqG/duNrkqWkgS CHgYchjvGjt+s2NGqsnMjDjjqOQrzUGn4zFXumNxx/nJhchWBXMeRtOrp efZY6DMhZw3cz+xW2Ly1+ftVY754CqoBtmjm/NZsbutC4gBQOYHzYf3cB sruHhESK3zosSYhn4/pjxMflqpSj5T7MXLytnlCfKF3E3a2hOJFBxK5v/ E5p5jX3XaJ8MHnlPxBOldkk1SkdjtcKC7cBmEOx/duXd/U+pgloUKMpbK c2oolHZ5eAXsePF6oxXt1hG958l599byK6w8/GvCTQ3KsCmESOpsV9Mis Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="361726055" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="361726055" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 05:14:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="788508188" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="788508188" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Jul 2023 05:14:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 22DA81C7; Mon, 3 Jul 2023 15:14:13 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , Wolfram Sang , Andi Shyti , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, acpica-devel@lists.linuxfoundation.org Cc: "Rafael J. Wysocki" , Len Brown , Robert Moore , Michael Walle Subject: [PATCH v4 4/5] ACPI: scan: Use the acpi_match_acpi_device() helper Date: Mon, 3 Jul 2023 15:14:10 +0300 Message-Id: <20230703121411.69606-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> References: <20230703121411.69606-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770402875758847797?= X-GMAIL-MSGID: =?utf-8?q?1770402875758847797?= Instead of doing two pass parsing of the table, replace acpi_match_device_ids() with acpi_match_acpi_device(). Signed-off-by: Andy Shevchenko --- drivers/acpi/scan.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index e75ed9123931..ec1c9bec8bae 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -928,26 +928,29 @@ static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev) return err; } +/* Do not use a button for S5 wakeup */ +#define ACPI_AVOID_WAKE_FROM_S5 BIT(0) + static bool acpi_wakeup_gpe_init(struct acpi_device *device) { static const struct acpi_device_id button_device_ids[] = { - {"PNP0C0C", 0}, /* Power button */ - {"PNP0C0D", 0}, /* Lid */ - {"PNP0C0E", 0}, /* Sleep button */ + {"PNP0C0C", 0}, /* Power button */ + {"PNP0C0D", ACPI_AVOID_WAKE_FROM_S5}, /* Lid */ + {"PNP0C0E", ACPI_AVOID_WAKE_FROM_S5}, /* Sleep button */ {"", 0}, }; struct acpi_device_wakeup *wakeup = &device->wakeup; + const struct acpi_device_id *match; acpi_status status; wakeup->flags.notifier_present = 0; /* Power button, Lid switch always enable wakeup */ - if (!acpi_match_device_ids(device, button_device_ids)) { - if (!acpi_match_device_ids(device, &button_device_ids[1])) { - /* Do not use Lid/sleep button for S5 wakeup */ - if (wakeup->sleep_state == ACPI_STATE_S5) - wakeup->sleep_state = ACPI_STATE_S4; - } + match = acpi_match_acpi_device(button_device_ids, device); + if (match) { + if ((match->driver_data & ACPI_AVOID_WAKE_FROM_S5) && + wakeup->sleep_state == ACPI_STATE_S5) + wakeup->sleep_state = ACPI_STATE_S4; acpi_mark_gpe_for_wake(wakeup->gpe_device, wakeup->gpe_number); device_set_wakeup_capable(&device->dev, true); return true;