From patchwork Mon Jun 26 11:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 112864 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7404718vqr; Mon, 26 Jun 2023 04:22:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4DjI4FU9pe2X3Lne4YmDnAtiXuBrCRPiR8cmkVBLQ1XlgEWeMkSNTNsF/vCQK6K5H6cqH7 X-Received: by 2002:a17:902:d489:b0:1b7:e49f:d with SMTP id c9-20020a170902d48900b001b7e49f000dmr6786902plg.28.1687778520932; Mon, 26 Jun 2023 04:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687778520; cv=none; d=google.com; s=arc-20160816; b=P1PJ3/zNoFOXQ+XKEv6T7fEIOySltaInqCqiVPpwNIQqHn/RLm0+2ru7QwFVpz25mZ E9sgr6jGxFV1uhIohOmW+bISLsX/w1ANxwINpPUBEv4B4MulnZLoB0bFOeoKlYeWhWib rSTJ9Xe5ztwOn94Rb4OPkP3iaTacwqOXuDi0Pd1N903TjOFHLA4ehxZqx9AiWXA+zrb2 Ds6rdMpj8RdlrBxRvIdOjTDGvi/JfB7+RY1G9KDsvyt9Qn/iFv77TC5/q824QezBPHHH c3W7n6XJ6XvvZ9HHLLCcgxrDJbibUHQz+0PbujA8oZJ0N2pA4MFBDtHAN9jzlQqua5QE IzRQ== 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=nNkoZ4evSnDmcjWcTDU7LcxZRi5iH7M+CYC+6Jli+cM=; fh=YLPw3QnAgtYwSsGR7bXzDTb3Qi4Z0gTtWmJMk1JxRoE=; b=XuaVx8qajnbby8yQ2aWt+TvQxruZKWuj5NdZV3lIOGWfwD5Z3FvQzEywYMgmVcxRdi yQNjV9KQ8tJuyBZSmfekqrbSBic0PjF59rRO+UauHp/VfzIWRRj/e+JtAnmPaqKVO1tH uFQeuiQ/Oc4QEykj9ez4p47R3v+g3NsZq5cB5+uR3/0C3HVFRJsHPnjXMyh+yuLFMIDC cWkxxLKqJXl+vnlTX3RvTeSu91CvraMPHbak7EHwiqp+FXUv8h/awBOR6D3A/jYCtg1P ARGffBWVESiXqOev5tUSBjmvYFCMIsaQ2/caFowoXy6N5hNVgYjQrHdhO6owyZz/2t7p OtpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=F3BZxFX6; 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 i6-20020a17090332c600b001b802129b44si1994337plr.556.2023.06.26.04.21.48; Mon, 26 Jun 2023 04:22:00 -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=F3BZxFX6; 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 S230079AbjFZLAk (ORCPT + 99 others); Mon, 26 Jun 2023 07:00:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229664AbjFZLAc (ORCPT ); Mon, 26 Jun 2023 07:00:32 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BFC510DB; Mon, 26 Jun 2023 04:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687777221; x=1719313221; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cfkHmvhL16siboX9Cx9flRIYjtdn8/awF8GL0BpfHpU=; b=F3BZxFX6bPium+iZbkUPTbppIqKQW0/tgWrG28seB+980y/XOvOPbhtQ XgPNyVBi5djSbzEqWMp2r+JrbbxsXAaaCjPyNfKktp8D5qMhM4iVOP1h8 FbEKvvgVUGBnYJub+9XrgUS7Xkbpjy/wHkVwdiS0QhZFYbBQkyLk+pxgz B0jae98e1/CjMxb3d9VZkUn2UGD1tsV5OFJcXfxzG4HF/h1mmnaZpnszz KSrNrPBxb+Lo4zt14haJYCzckHcyFHp9CT5HGcp3BuL9zc0n6dGsJkZWl iZplQUeTBkt0vlZxzcFhDf5HSCyBAJrc4vnchvpADwG4bZ/l1YmjsquIN g==; X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="427232827" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="427232827" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 04:00:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="890245264" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="890245264" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 26 Jun 2023 04:00:16 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0C220370; Mon, 26 Jun 2023 14:00:28 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , 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 , Andi Shyti , Robert Moore , Michael Walle Subject: [PATCH v3 2/4] ACPI: bus: Introduce acpi_match_acpi_device() helper Date: Mon, 26 Jun 2023 14:00:24 +0300 Message-Id: <20230626110026.65825-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230626110026.65825-1-andriy.shevchenko@linux.intel.com> References: <20230626110026.65825-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?1769764050451507873?= X-GMAIL-MSGID: =?utf-8?q?1769764050451507873?= In some cases we can't have a physical node associated with the ACPI device. Yet we want to match it against ID table and get respective driver data. Introduce the helper for that. Signed-off-by: Andy Shevchenko --- drivers/acpi/bus.c | 15 +++++++++++---- include/linux/acpi.h | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 20cdfb37da79..ee88bfb60ac2 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -850,6 +850,16 @@ static bool __acpi_match_device(const struct acpi_device *device, return true; } +const struct acpi_device_id *acpi_match_acpi_device(const struct acpi_device_id *ids, + const struct acpi_device *adev) +{ + const struct acpi_device_id *id = NULL; + + __acpi_match_device(adev, ids, NULL, &id, NULL); + return id; +} +EXPORT_SYMBOL_GPL(acpi_match_acpi_device); + /** * acpi_match_device - Match a struct device against a given list of ACPI IDs * @ids: Array of struct acpi_device_id object to match against. @@ -864,10 +874,7 @@ static bool __acpi_match_device(const struct acpi_device *device, const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev) { - const struct acpi_device_id *id = NULL; - - __acpi_match_device(acpi_companion_match(dev), ids, NULL, &id, NULL); - return id; + return acpi_match_acpi_device(ids, acpi_companion_match(dev)); } EXPORT_SYMBOL_GPL(acpi_match_device); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 640f1c07c894..641dc4843987 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -707,6 +707,9 @@ extern int acpi_nvs_register(__u64 start, __u64 size); extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), void *data); +const struct acpi_device_id *acpi_match_acpi_device(const struct acpi_device_id *ids, + const struct acpi_device *adev); + const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev); @@ -922,6 +925,12 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), struct acpi_device_id; +static inline const struct acpi_device_id *acpi_match_acpi_device( + const struct acpi_device_id *ids, const struct acpi_device *adev) +{ + return NULL; +} + static inline const struct acpi_device_id *acpi_match_device( const struct acpi_device_id *ids, const struct device *dev) {