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,
mika.westerberg@linux.intel.com, Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH V7 01/11] ACPI: introduce .match() callback for ACPI scan handler
Date: Fri, 23 May 2014 02:02:23 +0800 [thread overview]
Message-ID: <1400781753-2682-2-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1400781753-2682-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 7efe546..e46e51c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1974,14 +1974,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 84a2e29..ba679af 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);
void (*bind)(struct device *phys_dev);
--
1.8.3.2
next prev parent reply other threads:[~2014-05-22 18:02 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 18:02 [PATCH V7 00/11] ACPI: ACPI enumeration rework Zhang Rui
2014-05-22 18:02 ` Zhang Rui [this message]
2014-05-22 18:02 ` [PATCH V7 02/11] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-05-22 18:14 ` Bjorn Helgaas
2014-05-23 0:00 ` Zhang Rui
2014-05-22 18:02 ` [PATCH V7 03/11] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-05-22 18:02 ` [PATCH V7 04/11] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-05-22 18:02 ` [PATCH V7 05/11] ACPI: allow scan handlers without .attach() callback Zhang Rui
2014-05-22 18:02 ` [PATCH V7 06/11] ACPI: always register container scan handler even if CONFIG_ACPI_CONTAINER is cleared Zhang Rui
2014-05-22 18:02 ` [PATCH V7 07/11] ACPI: always register memory hotplug scan handler even if CONFIG_ACPI_HOTPLUG_MEMORY " Zhang Rui
2014-05-22 18:02 ` [PATCH V7 08/11] ACPI: always register memory hotplug scan handler even if CONFIG_X86_INTEL_LPSS " Zhang Rui
2014-05-26 10:56 ` Mika Westerberg
2014-05-26 11:53 ` Rafael J. Wysocki
2014-05-26 11:52 ` Mika Westerberg
2014-05-26 12:40 ` Rafael J. Wysocki
2014-05-26 12:58 ` Mika Westerberg
2014-05-22 18:02 ` [PATCH V7 09/11] ACPI: introduce platform_id flag Zhang Rui
2014-05-22 18:02 ` [PATCH V7 10/11] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-05-26 10:21 ` Mika Westerberg
2014-05-28 7:16 ` Zhang Rui
2014-05-22 18:02 ` [PATCH V7 11/11] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-05-30 2:20 ` [PATCH 0/10] ACPI enumeration rework (was: Re: [PATCH V7 00/11] ACPI: ACPI enumeration rework) Rafael J. Wysocki
2014-05-30 2:21 ` [PATCH 1/10] ACPI / scan: .match() callback for ACPI scan handlers Rafael J. Wysocki
2014-05-30 2:23 ` [PATCH 2/10] ACPI / PNP: use device ID list for PNPACPI device enumeration Rafael J. Wysocki
2014-05-30 2:24 ` [PATCH 3/10] ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule Rafael J. Wysocki
2014-05-30 2:25 ` [PATCH 4/10] ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list Rafael J. Wysocki
2014-05-30 2:26 ` [PATCH 5/10] ACPI / scan: introduce platform_id device PNP type flag Rafael J. Wysocki
2014-05-30 2:27 ` [PATCH 6/10] ACPI / scan: Change the meaning of missing .attach() in scan handlers Rafael J. Wysocki
2014-05-30 2:28 ` [PATCH 7/10] ACPI / scan: always register container scan handler Rafael J. Wysocki
2014-05-30 2:29 ` [PATCH 8/10] ACPI / scan: always register memory hotplug " Rafael J. Wysocki
2014-05-30 2:30 ` [PATCH 9/10] ACPI / scan: always register ACPI LPSS " Rafael J. Wysocki
2014-05-30 12:34 ` [Update][PATCH " Rafael J. Wysocki
2014-05-30 2:30 ` [PATCH 10/10] ACPI / scan: use platform bus type by default for _HID enumeration Rafael J. Wysocki
2014-05-30 12:35 ` [Update][PATCH " Rafael J. Wysocki
2014-05-31 5:56 ` Zhang Rui
2014-05-31 6:29 ` Zhang Rui
2014-05-30 8:33 ` [PATCH 0/10] ACPI enumeration rework (was: Re: [PATCH V7 00/11] ACPI: ACPI enumeration rework) Mika Westerberg
2014-05-30 12:17 ` Rafael J. Wysocki
2014-05-31 14:46 ` Zhang Rui
2014-05-31 22:29 ` Rafael J. Wysocki
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=1400781753-2682-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=mika.westerberg@linux.intel.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).