From: Zhang Rui <rui.zhang@intel.com>
To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: bhelgaas@google.com, matthew.garrett@nebula.com,
rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH V2 01/13] ACPI: introduce .match() callback for ACPI scan handler
Date: Fri, 14 Mar 2014 00:16:41 +0800 [thread overview]
Message-ID: <1394727413-3587-2-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1394727413-3587-1-git-send-email-rui.zhang@intel.com>
Currently, ACPI scan handler uses strcmp() to match device ids
and scan handler ids.
When converting PNPACPI enumeration into a scan handler, which I will do
later in this patch set, the current code becomes not flexible enough
because ACPI pnp scan handler requires wildcase and case insensitive support.
Thus a per scan handler .match() callback is introduced in this patch,
so that specified scan handler can have more flexible matching mechanism
by introduce its own .match() callback.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/scan.c | 17 +++++++++++------
include/acpi/acpi_bus.h | 1 +
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 57b053f..dca22eb 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1907,14 +1907,19 @@ static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
const struct acpi_device_id *devid;
for (devid = handler->ids; devid->id[0]; devid++)
- if (!strcmp((char *)devid->id, idstr)) {
- if (matchid)
- *matchid = devid;
-
- return true;
- }
+ if (handler->match) {
+ if (handler->match(idstr, (char *)devid->id))
+ goto success;
+ } else
+ if (!strcmp((char *)devid->id, idstr))
+ goto success;
return false;
+
+success:
+ if (matchid)
+ *matchid = devid;
+ return true;
}
static struct acpi_scan_handler *acpi_scan_match_handler(char *idstr,
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 8256eb4..8c5e235 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -131,6 +131,7 @@ static inline struct acpi_hotplug_profile *to_acpi_hotplug_profile(
struct acpi_scan_handler {
const struct acpi_device_id *ids;
struct list_head list_node;
+ int (*match)(char *devid, char *handler_id);
int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);
void (*detach)(struct acpi_device *dev);
struct acpi_hotplug_profile hotplug;
--
1.7.9.5
next prev parent reply other threads:[~2014-03-13 16:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 16:16 [PATCH V2 0/13] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-03-13 16:16 ` Zhang Rui [this message]
2014-03-13 16:16 ` [PATCH V2 02/13] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-03-13 16:16 ` [PATCH V2 03/13] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-03-13 16:16 ` [PATCH V2 04/13] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-03-13 16:16 ` [PATCH V2 05/13] ACPI: check and enumerate CMOS RTC devices explicitly Zhang Rui
2014-03-13 16:16 ` [PATCH V2 06/13] ACPI: introduce enumerable_id flag Zhang Rui
2014-03-15 1:03 ` Rafael J. Wysocki
2014-03-15 1:12 ` Zhang, Rui
2014-03-13 16:16 ` [PATCH V2 07/13] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-03-13 16:16 ` [PATCH V2 08/13] ACPI: introduce dummy lpss scan handler Zhang Rui
2014-03-13 16:16 ` [PATCH V2 09/13] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 10/13] Revert "ACPI / PNP: skip ACPI device nodes associated with physical nodes already" Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 11/13] ACPI: create both PNP and Platform device nodes for PNP0C01/PNP0C02 Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 12/13] ACPI: introduce dummy container scan handler Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 13/13] ACPI: introduce dummy memory hotplug " Zhang Rui
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=1394727413-3587-2-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=bhelgaas@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=rafael.j.wysocki@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 NNTP newsgroup(s).