From patchwork Mon Feb 3 08:47:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3568601 Return-Path: X-Original-To: patchwork-linux-spi@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 82B899F383 for ; Mon, 3 Feb 2014 08:47:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BB522017B for ; Mon, 3 Feb 2014 08:47:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88CCA2017A for ; Mon, 3 Feb 2014 08:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751378AbaBCIrb (ORCPT ); Mon, 3 Feb 2014 03:47:31 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:44860 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750AbaBCIra (ORCPT ); Mon, 3 Feb 2014 03:47:30 -0500 Received: from ayla.of.borg ([84.193.72.141]) by albert.telenet-ops.be with bizsmtp id MknS1n00T32ts5g06knSNM; Mon, 03 Feb 2014 09:47:28 +0100 Received: from geert (helo=localhost) by ayla.of.borg with local-esmtp (Exim 4.76) (envelope-from ) id 1WAFBd-0006kF-Sm; Mon, 03 Feb 2014 09:47:25 +0100 Date: Mon, 3 Feb 2014 09:47:25 +0100 (CET) From: Geert Uytterhoeven To: "Shimoda, Yoshihiro" , Grant Likely , Rob Herring cc: Mark Brown , linux-spi@vger.kernel.org, SH-Linux , devicetree@vger.kernel.org, Linux Kernel Development Subject: Re: [PATCH] spi: rspi: fix build error when CONFIG_OF is not set In-Reply-To: <52EEF452.4060205@renesas.com> Message-ID: References: <52EEF452.4060205@renesas.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.4 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 Hi Shimoda-san, On Mon, 3 Feb 2014, Shimoda, Yoshihiro wrote: > This patch fixes an issue that the following build error happens when > the CONFIG_OF is not set: > > drivers/spi/spi-rspi.c: In function 'rspi_probe': > drivers/spi/spi-rspi.c:1203:26: error: 'rspi_of_match' undeclared (first use in this function) > > Signed-off-by: Yoshihiro Shimoda > --- > This patch is based on the latest origin/topic/rspi branch in the spi.git. > > drivers/spi/spi-rspi.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c > index 34ad4bc..e5cfc3d 100644 > --- a/drivers/spi/spi-rspi.c > +++ b/drivers/spi/spi-rspi.c > @@ -1164,6 +1164,7 @@ static int rspi_parse_dt(struct device *dev, struct spi_master *master) > return 0; > } > #else > +#define rspi_of_match NULL > static inline int rspi_parse_dt(struct device *dev, struct spi_master *master) > { > return -EINVAL; > -- > 1.7.1 Thanks, obviously I missed that of_match_device() still uses the ID table parameter if CONFIG_OF=n :-( Below I have two alternative solutions: 1. Uses rspi_of_match() to nullify the ID table pointer, like is done in the platform_driver structure, 2. Fixes it at the OF subsystem level, by nullifying the ID table pointer inside of_match_device(). If 2 is accepted, drivers don't have to care about this anymore. What do you think? From 060b8577e95441ee3b29e966a9fdd19b2a870bdf Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 3 Feb 2014 09:22:06 +0100 Subject: [PATCH 1/2] spi: rspi: fix build error when CONFIG_OF is not set If CONFIG_OF=n: drivers/spi/spi-rspi.c: In function 'rspi_probe': drivers/spi/spi-rspi.c:1203:26: error: 'rspi_of_match' undeclared (first use in this function) drivers/spi/spi-rspi.c:1203:26: note: each undeclared identifier is reported only once for each function it appears in Use of_match_ptr() to fix this. Reported-by: Yoshihiro Shimoda Signed-off-by: Geert Uytterhoeven --- drivers/spi/spi-rspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 1c3aed63a2e0..df637184f6f0 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -1200,7 +1200,7 @@ static int rspi_probe(struct platform_device *pdev) return -ENOMEM; } - of_id = of_match_device(rspi_of_match, &pdev->dev); + of_id = of_match_device(of_match_ptr(rspi_of_match), &pdev->dev); if (of_id) { ops = of_id->data; ret = rspi_parse_dt(&pdev->dev, master); -- 1.7.9.5 From 477ab825d43524959d68c3974e6e9536bd83bcde Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 3 Feb 2014 09:27:40 +0100 Subject: [PATCH 2/2] [RFC] of/device: Nullify match table in of_match_device() for CONFIG_OF=n If the of_device_id table inside a device driver is protected by #ifdef CONFIG_OF, the driver still has to provide a dummy declaration of the table, or wrap it inside of_match_ptr(), when calling of_match_device() in the CONFIG_OF=n case, else the driver fails to compile with e.g. drivers/spi/spi-rspi.c: In function 'rspi_probe': drivers/spi/spi-rspi.c:1203:26: error: 'rspi_of_match' undeclared (first use in this function) drivers/spi/spi-rspi.c:1203:26: note: each undeclared identifier is reported only once for each function it appears in Make of_match_device() nullify the table pointer if CONFIG_OF=n to fix this. Reported-by: Yoshihiro Shimoda Signed-off-by: Geert Uytterhoeven --- include/linux/of_device.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 82ce324fdce7..dac8bd2890ca 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -72,11 +72,13 @@ static inline int of_device_uevent_modalias(struct device *dev, static inline void of_device_node_put(struct device *dev) { } -static inline const struct of_device_id *of_match_device( +static inline const struct of_device_id *__of_match_device( const struct of_device_id *matches, const struct device *dev) { return NULL; } +#define of_match_device(matches, dev) \ + __of_match_device(of_match_ptr(matches), (dev)) static inline struct device_node *of_cpu_device_node_get(int cpu) {