From patchwork Fri Apr 12 05:02:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 10897259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E0D2F1708 for ; Fri, 12 Apr 2019 05:02:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA15F28E30 for ; Fri, 12 Apr 2019 05:02:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE5C728E6F; Fri, 12 Apr 2019 05:02:58 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 5E65528E30 for ; Fri, 12 Apr 2019 05:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726217AbfDLFCs (ORCPT ); Fri, 12 Apr 2019 01:02:48 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:40518 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725788AbfDLFCg (ORCPT ); Fri, 12 Apr 2019 01:02:36 -0400 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id A0FFE891AA; Fri, 12 Apr 2019 17:02:31 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1555045351; bh=yxYq12tQ+1PP1TKykeYy3zcJNJhG05iavGcQg6WDqvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=idTs7woZA8gaO6GdWYLx+UWLBJkrq/+1wF7hUh56ub5ZA2ILTbthLdHiN9+0xG8Ez 8eznrZBKl7nsR53+pOXi7Pkh6H0kTJS/r4GcRvfcNOycuNZN2ddqwp8qrXy8G/kF3T ofh3fDHBNlP9Hz3zIxZHfJ7YUW649VTl96f+xs9Nfg16X0MVJiOMdcGRwu2+v6oqrU diFAYlsOz9LnIUAaPfPtWaGmOZCzYfzLiBE6ydEPfKVKolMEPS1o7/I7QGxMGVhoGZ 3MGLgxBcgVVzfGKmZxlaanXV5VTDk05gLU3Vf51fl7wRKtvB8v/YxUywlXhEen2zxS 4taIVqDA+OuuQ== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7,5,8,10121) id ; Fri, 12 Apr 2019 17:02:31 +1200 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id BBBD913EF07; Fri, 12 Apr 2019 17:02:26 +1200 (NZST) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 813441E1D9C; Fri, 12 Apr 2019 17:02:26 +1200 (NZST) From: Chris Packham To: broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: Hamish Martin , linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Packham Subject: [PATCH 2/3] spi: Make of_find_spi_controller_by_node visible Date: Fri, 12 Apr 2019 17:02:12 +1200 Message-Id: <20190412050213.17698-3-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190412050213.17698-1-chris.packham@alliedtelesis.co.nz> References: <20190412050213.17698-1-chris.packham@alliedtelesis.co.nz> MIME-Version: 1.0 x-atlnz-ls: pat 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 Drop the static and add of_find_spi_controller_by_node() to spi.h. Also move it outside of the CONFIG_OF_DYNAMIC so it is available with just CONFIG_OF. Signed-off-by: Chris Packham --- drivers/spi/spi.c | 7 ++++--- include/linux/spi/spi.h | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 93986f879b09..19929163a45b 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3531,16 +3531,14 @@ struct spi_device *of_find_spi_device_by_node(struct device_node *node) return dev ? to_spi_device(dev) : NULL; } EXPORT_SYMBOL_GPL(of_find_spi_device_by_node); -#endif /* IS_ENABLED(CONFIG_OF) */ -#if IS_ENABLED(CONFIG_OF_DYNAMIC) static int __spi_of_controller_match(struct device *dev, const void *data) { return dev->of_node == data; } /* the spi controllers are not using spi_bus, so we find it with another way */ -static struct spi_controller *of_find_spi_controller_by_node(struct device_node *node) +struct spi_controller *of_find_spi_controller_by_node(struct device_node *node) { struct device *dev; @@ -3555,7 +3553,10 @@ static struct spi_controller *of_find_spi_controller_by_node(struct device_node /* reference got in class_find_device */ return container_of(dev, struct spi_controller, dev); } +EXPORT_SYMBOL_GPL(of_find_spi_controller_by_node); +#endif /* IS_ENABLED(CONFIG_OF) */ +#if IS_ENABLED(CONFIG_OF_DYNAMIC) static int of_spi_notify(struct notifier_block *nb, unsigned long action, void *arg) { diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 662b336aa2e4..e763290767ea 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -1334,6 +1334,8 @@ spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer) extern struct spi_device * of_find_spi_device_by_node(struct device_node *node); +extern struct spi_controller * +of_find_spi_controller_by_node(struct device_node *node); #else static inline struct spi_device * @@ -1342,6 +1344,11 @@ of_find_spi_device_by_node(struct device_node *node) return NULL; } +static inline struct spi_controller * +of_find_spi_controller_by_node(struct device_node *node) +{ + return NULL; +} #endif /* IS_ENABLED(CONFIG_OF) */ /* Compatibility layer */