From: Crestez Dan Leonard <leonard.crestez@intel.com>
To: linux-acpi@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>
Cc: Crestez Dan Leonard <leonard.crestez@intel.com>,
linux-i2c@vger.kernel.org, Wolfram Sang <wsa@the-dreams.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-kernel@vger.kernel.org,
Irina Tirdea <irina.tirdea@intel.com>,
Octavian Purdila <octavian.purdila@intel.com>,
Daniel Baluta <daniel.baluta@intel.com>
Subject: [RFC v2 1/2] acpi: Expose acpi_of_match_device
Date: Thu, 9 Jun 2016 16:06:02 +0300 [thread overview]
Message-ID: <66f6a4e6d0eb771f66becf4017eda31df3629341.1465477193.git.leonard.crestez@intel.com> (raw)
In-Reply-To: <cover.1465477193.git.leonard.crestez@intel.com>
In-Reply-To: <cover.1465477193.git.leonard.crestez@intel.com>
This can be used by device drivers as the equivalent of of_match_device
when they are instantiated through ACPI using devicetree IDs. This is
described in Documentation/acpi/enumeration.txt
Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com>
---
drivers/acpi/bus.c | 13 +++++++------
include/linux/acpi.h | 8 ++++++++
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 27367d4..b366bb2 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -574,18 +574,18 @@ struct acpi_device *acpi_companion_match(const struct device *dev)
* identifiers and a _DSD object with the "compatible" property, use that
* property to match against the given list of identifiers.
*/
-static bool acpi_of_match_device(struct acpi_device *adev,
- const struct of_device_id *of_match_table)
+const struct of_device_id* acpi_of_match_device(const struct acpi_device *adev,
+ const struct of_device_id *of_match_table)
{
const union acpi_object *of_compatible, *obj;
int i, nval;
if (!adev)
- return false;
+ return NULL;
of_compatible = adev->data.of_compatible;
if (!of_match_table || !of_compatible)
- return false;
+ return NULL;
if (of_compatible->type == ACPI_TYPE_PACKAGE) {
nval = of_compatible->package.count;
@@ -600,11 +600,12 @@ static bool acpi_of_match_device(struct acpi_device *adev,
for (id = of_match_table; id->compatible[0]; id++)
if (!strcasecmp(obj->string.pointer, id->compatible))
- return true;
+ return id;
}
- return false;
+ return NULL;
}
+EXPORT_SYMBOL(acpi_of_match_device);
static bool __acpi_match_device_cls(const struct acpi_device_id *id,
struct acpi_hardware_id *hwid)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d4a3cb2..0810001 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -524,6 +524,8 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
const struct device *dev);
+const struct of_device_id *acpi_of_match_device(const struct acpi_device *dev,
+ const struct of_device_id *ids);
extern bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv);
@@ -649,6 +651,12 @@ static inline const struct acpi_device_id *acpi_match_device(
return NULL;
}
+const struct of_device_id *acpi_of_match_device(const struct acpi_device *dev,
+ const struct acpi_device_id *ids)
+{
+ return NULL;
+}
+
static inline bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv)
{
--
2.5.5
next prev parent reply other threads:[~2016-06-09 13:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 13:06 [RFC v2 0/2] Match i2c_device_id when using DT ids through ACPI Crestez Dan Leonard
2016-06-09 13:06 ` Crestez Dan Leonard [this message]
2016-06-09 13:06 ` [RFC v2 2/2] i2c: Pass i2c_device_id to probe func " Crestez Dan Leonard
2016-06-10 6:32 ` Mika Westerberg
2016-06-10 15:57 ` Crestez Dan Leonard
2016-06-13 9:26 ` Mika Westerberg
2016-06-10 7:04 ` Wolfram Sang
2016-06-10 12:00 ` Crestez Dan Leonard
2016-06-10 13:07 ` Wolfram Sang
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=66f6a4e6d0eb771f66becf4017eda31df3629341.1465477193.git.leonard.crestez@intel.com \
--to=leonard.crestez@intel.com \
--cc=daniel.baluta@intel.com \
--cc=irina.tirdea@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=octavian.purdila@intel.com \
--cc=rjw@rjwysocki.net \
--cc=wsa@the-dreams.de \
/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 NNTP newsgroup(s).