Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754581AbdGUVFI (ORCPT ); Fri, 21 Jul 2017 17:05:08 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34670 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752048AbdGUVFF (ORCPT ); Fri, 21 Jul 2017 17:05:05 -0400 Subject: Re: [PATCH] of: provide of_n_{addr,size}_cells wrappers for !CONFIG_OF To: Arnd Bergmann , Rob Herring References: <20170721202012.3360244-1-arnd@arndb.de> Cc: devicetree@vger.kernel.org, Grant Likely , Lucas Stach , Bjorn Helgaas , Magnus Damm , Geert Uytterhoeven , Ben Dooks , linux-pci@vger.kernel.org, linux-sh@vger.kernel.org, Sakari Ailus , Sudeep Holla , "Rafael J. Wysocki" , Kieran Bingham , Alan Tull , Geert Uytterhoeven , Richard Fitzgerald , linux-kernel@vger.kernel.org From: Frank Rowand Message-ID: <59726C73.6000000@gmail.com> Date: Fri, 21 Jul 2017 14:04:51 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20170721202012.3360244-1-arnd@arndb.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2374 Lines: 59 On 07/21/17 13:19, Arnd Bergmann wrote: > The pci-rcar driver is enabled for compile tests, and this has > now shown that the driver cannot build without CONFIG_OF, > following the inclusion of f8f2fe7355fb "PCI: rcar: Use new OF > interrupt mapping when possible": > > ../drivers/pci/host/pcie-rcar.c: In function 'pci_dma_range_parser_init': > ../drivers/pci/host/pcie-rcar.c:856:2: error: implicit declaration of function 'of_n_addr_cells' [-Werror=implicit-function-declaration] > parser->pna = of_n_addr_cells(node); > ^ > As pointed out by Ben Dooks and Geert Uytterhoeven, this is actually > supposed to build fine, which we can achieve if we make the > declaration of of_irq_parse_and_map_pci conditional on CONFIG_OF > and provide an empty inline function otherwise, as we do for > a lot of other of interfaces. > > This lets us build the rcar_pci driver again without CONFIG_OF > for build testing. All platforms using this driver select OF, > so this doesn't change anything for the users. > > Signed-off-by: Arnd Bergmann > Cc: devicetree@vger.kernel.org > Cc: Rob Herring > Cc: Grant Likely > Cc: Lucas Stach > Cc: Bjorn Helgaas > Cc: Magnus Damm > Cc: Geert Uytterhoeven > Cc: Ben Dooks > Cc: linux-pci@vger.kernel.org > Cc: linux-sh@vger.kernel.org > > --- > I originally sent the patch in 2014 when things initially broke > and then forgot about while it was applied in my randconfig patch > stack. I sent it again in 2016 without replay. > > It's still broken and I think this is the correct fix. > --- > include/linux/of.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/linux/of.h b/include/linux/of.h > index 4a8a70916237..1efdbe53136c 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -735,6 +735,9 @@ static inline struct device_node *of_get_cpu_node(int cpu, > return NULL; > } > > +static inline int of_n_addr_cells(struct device_node *np) { return 0; } > +static inline int of_n_size_cells(struct device_node *np) { return 0; } > + > static inline int of_property_read_u64(const struct device_node *np, > const char *propname, u64 *out_value) > { > Reviewed-by: Frank Rowand