From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-i2c@vger.kernel.org,
acpica-devel@lists.linuxfoundation.org
Cc: Robert Moore <robert.moore@intel.com>,
Michael Walle <michael@walle.cc>, Len Brown <lenb@kernel.org>,
Andi Shyti <andi.shyti@kernel.org>
Subject: [Acpica-devel] [PATCH v3 2/4] ACPI: bus: Introduce acpi_match_acpi_device() helper
Date: Mon, 26 Jun 2023 11:00:22 -0000 [thread overview]
Message-ID: <20230626110026.65825-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20230626110026.65825-1-andriy.shevchenko@linux.intel.com>
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 <andriy.shevchenko@linux.intel.com>
---
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)
{
--
2.40.0.1.gaa8946217a0b
next prev parent reply other threads:[~2023-06-26 11:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 11:00 [Acpica-devel] [PATCH v3 0/4] ACPI: platform: Fix SMB0001 enumeration on Kontron devices Andy Shevchenko
2023-06-26 11:00 ` Andy Shevchenko [this message]
2023-06-29 8:45 ` [Acpica-devel] [PATCH v3 2/4] ACPI: bus: Introduce acpi_match_acpi_device() helper Rafael J. Wysocki
2023-06-26 11:00 ` [Acpica-devel] [PATCH v3 3/4] ACPI: platform: Ignore SMB0001 only when it has resources Andy Shevchenko
2023-06-29 16:00 ` Andi Shyti
2023-06-26 11:00 ` [Acpica-devel] [PATCH v3 4/4] ACPI: platform: Move SMB0001 HID to the header and reuse Andy Shevchenko
2023-06-26 11:00 ` [Acpica-devel] [PATCH v3 1/4] ACPI: bus: Constify acpi_companion_match() returned value Andy Shevchenko
2023-06-29 8:49 ` Rafael J. Wysocki
2023-06-29 9:08 ` Andy Shevchenko
2023-06-29 9:43 ` Rafael J. Wysocki
2023-06-29 15:52 ` Andi Shyti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230626110026.65825-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=acpica-devel@lists.linuxfoundation.org \
--cc=andi.shyti@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@walle.cc \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).