From patchwork Wed Jul 13 11:53:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Crestez Dan Leonard X-Patchwork-Id: 647872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rqHPC6S9Zz9snk for ; Wed, 13 Jul 2016 21:56:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751685AbcGMLzA (ORCPT ); Wed, 13 Jul 2016 07:55:00 -0400 Received: from mga02.intel.com ([134.134.136.20]:1597 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751572AbcGMLyx (ORCPT ); Wed, 13 Jul 2016 07:54:53 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 13 Jul 2016 04:54:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,357,1464678000"; d="scan'208";a="1005949709" Received: from cdleonard-desk.rb.intel.com ([10.237.104.169]) by fmsmga001.fm.intel.com with ESMTP; 13 Jul 2016 04:54:15 -0700 From: Crestez Dan Leonard To: linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , Jarkko Nikula , Mika Westerberg Cc: Crestez Dan Leonard , Len Brown , linux-i2c@vger.kernel.org, Wolfram Sang , linux-spi@vger.kernel.org, Mark Brown , linux-kernel@vger.kernel.org, Octavian Purdila Subject: [PATCH v2 1/3] acpi: Export acpi_of_modalias equiv of of_modalias_node Date: Wed, 13 Jul 2016 14:53:40 +0300 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org When using devicetree stuff like i2c_client.name or spi_device.modalias is initialized to the first DT compatible id with the vendor prefix stripped. Since some drivers rely on this try to replicate it when using ACPI with DT ids. Signed-off-by: Crestez Dan Leonard Reviewed-by: Mika Westerberg --- drivers/acpi/bus.c | 36 ++++++++++++++++++++++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 37 insertions(+) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index cb9558e..77a1a80 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -654,6 +654,42 @@ static bool acpi_of_match_device(struct acpi_device *adev, return false; } +/** + * acpi_of_modalias - Like of_modalias_node for ACPI with DT ids + * @adev: ACPI device object to match. + * @outstr: Pointer to buffer for result + * @outlen: Length of outstr value + * + * If we have a DT id set outstr to the first compatible string with the vendor + * prefix stripped, just like of_modalias_node does for devicetree. + * + * Returns 0 on success or negative errno on failure. + */ +int acpi_of_modalias(struct acpi_device *adev, char *outstr, size_t outlen) +{ + const union acpi_object *of_compatible; + const union acpi_object *obj; + const char *str, *chr; + + of_compatible = adev->data.of_compatible; + if (!of_compatible) + return -ENODEV; + + if (of_compatible->type == ACPI_TYPE_PACKAGE) + obj = of_compatible->package.elements; + else /* Must be ACPI_TYPE_STRING. */ + obj = of_compatible; + + str = obj->string.pointer; + chr = strchr(str, ','); + if (chr) + str = chr + 1; + strlcpy(outstr, str, outlen); + + return 0; +} +EXPORT_SYMBOL_GPL(acpi_of_modalias); + static bool __acpi_match_device_cls(const struct acpi_device_id *id, struct acpi_hardware_id *hwid) { diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 788c6c35..1d8ff0d 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -515,6 +515,7 @@ void acpi_bus_trim(struct acpi_device *start); acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); int acpi_match_device_ids(struct acpi_device *device, const struct acpi_device_id *ids); +int acpi_of_modalias(struct acpi_device *adev, char *outstr, size_t outlen); int acpi_create_dir(struct acpi_device *); void acpi_remove_dir(struct acpi_device *);