From patchwork Fri Jan 27 13:30:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan O'Donovan X-Patchwork-Id: 9541813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC758601D7 for ; Fri, 27 Jan 2017 13:35:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF05A26E91 for ; Fri, 27 Jan 2017 13:35:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C302127F07; Fri, 27 Jan 2017 13:35:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4171126E91 for ; Fri, 27 Jan 2017 13:35:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754833AbdA0Nd1 (ORCPT ); Fri, 27 Jan 2017 08:33:27 -0500 Received: from bert.emutex.com ([91.103.1.109]:57869 "EHLO bert.emutex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754806AbdA0NcP (ORCPT ); Fri, 27 Jan 2017 08:32:15 -0500 Received: from [92.51.199.138] (helo=statler.emutex.com) by bert.emutex.com with esmtp (Exim 4.84) (envelope-from ) id 1cX6cQ-0001f4-Ry; Fri, 27 Jan 2017 13:31:10 +0000 Received: from [10.10.68.108] (helo=dan-Latitude-E5450.emutex.com) by statler.emutex.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84) (envelope-from ) id 1cX6cQ-0000Vg-HP; Fri, 27 Jan 2017 13:31:10 +0000 From: Dan O'Donovan To: linux-acpi@vger.kernel.org, Andy Shevchenko , "Rafael J . Wysocki" , Jarkko Nikula , Mika Westerberg , Mark Brown Cc: Len Brown , linux-i2c@vger.kernel.org, Wolfram Sang , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Dan O'Donovan , Crestez Dan Leonard Subject: [PATCH v4 1/3] ACPI / bus: Export acpi_of_modalias equiv of of_modalias_node Date: Fri, 27 Jan 2017 13:30:13 +0000 Message-Id: <1485523815-9629-2-git-send-email-dan@emutex.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485523815-9629-1-git-send-email-dan@emutex.com> References: <1485187737-22414-1-git-send-email-dan@emutex.com> <1485523815-9629-1-git-send-email-dan@emutex.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Crestez Dan Leonard 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 Signed-off-by: Dan O'Donovan Reviewed-by: Mika Westerberg Reviewed-by: Andy Shevchenko Reviewed-by: Jarkko Nikula Tested-by: Jarkko Nikula --- drivers/acpi/bus.c | 35 +++++++++++++++++++++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 36 insertions(+) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 95855cb..8b9657f 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -677,6 +677,41 @@ 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 + * + * This is a counterpart of of_modalias_node() for struct acpi_device + * objects. If there is a compatible string for @adev, copy it to the + * @outstr location with the vendor prefix stripped. + * + * 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, ','); + strlcpy(outstr, chr ? chr + 1 : 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 4242c31..351b4a4 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -522,6 +522,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 *);