From patchwork Wed Feb 26 09:11:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 3722581 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3685C9F2F7 for ; Wed, 26 Feb 2014 09:14:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56B41201BA for ; Wed, 26 Feb 2014 09:14:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B14B420173 for ; Wed, 26 Feb 2014 09:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409AbaBZJLY (ORCPT ); Wed, 26 Feb 2014 04:11:24 -0500 Received: from mga01.intel.com ([192.55.52.88]:44452 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbaBZJLU (ORCPT ); Wed, 26 Feb 2014 04:11:20 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 26 Feb 2014 01:11:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,546,1389772800"; d="scan'208";a="488297797" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.21.187]) by fmsmga002.fm.intel.com with ESMTP; 26 Feb 2014 01:11:18 -0800 From: Zhang Rui 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 Subject: [RFC PATCH 1/8] ACPI: introduce .match() callback for ACPI scan handler Date: Wed, 26 Feb 2014 17:11:07 +0800 Message-Id: <1393405874-3266-2-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393405874-3266-1-git-send-email-rui.zhang@intel.com> References: <1393405874-3266-1-git-send-email-rui.zhang@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 PNP acpi 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 --- 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;