From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754130Ab2KEQMQ (ORCPT ); Mon, 5 Nov 2012 11:12:16 -0500 Received: from smtp111.dfw.emailsrvr.com ([67.192.241.111]:39763 "EHLO smtp111.dfw.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953Ab2KEQMM (ORCPT ); Mon, 5 Nov 2012 11:12:12 -0500 Message-ID: <5097E55A.4090305@calxeda.com> Date: Mon, 05 Nov 2012 10:12:10 -0600 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Andreas Larsson CC: davem@davemloft.net, sam@ravnborg.org, sparclinux@vger.kernel.org, software@gaisler.com, Grant Likely , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again References: <50979310.9010902@gaisler.com> <1352112798-26307-1-git-send-email-andreas@gaisler.com> In-Reply-To: <1352112798-26307-1-git-send-email-andreas@gaisler.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/05/2012 04:53 AM, Andreas Larsson wrote: > This bug-fix makes sure that of_address_to_resource is defined extern for sparc > so that the sparc-specific implementation of of_address_to_resource() is once > again used when including include/linux/of_address.h in a sparc context. A > number of drivers in mainline relies on this function working for sparc. > > The bug was introduced in a850a7554442f08d3e910c6eeb4ee216868dda1e, "of/address: > add empty static inlines for !CONFIG_OF". Contrary to that commit title, the > static inlines are added for !CONFIG_OF_ADRESS, and CONFIG_OF_ADRESS is never s/ADRESS/ADDRESS/ > defined for sparc. This is good behavior for the other functions in > include/linux/of_address.h, as the extern functions defined in > drivers/of/address.c only gets linked when OF_ADDRESS is configured. However, > for of_address_to_resource is that there exists a sparc-specific implementation > in arch/sparc/arch/sparc/kernel/of_device_common.c > > Signed-off-by: Andreas Larsson Otherwise, Acked-by: Rob Herring > --- > arch/sparc/include/asm/prom.h | 5 +++++ > include/linux/of_address.h | 2 ++ > 2 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h > index c287651..f930031 100644 > --- a/arch/sparc/include/asm/prom.h > +++ b/arch/sparc/include/asm/prom.h > @@ -63,5 +63,10 @@ extern char *of_console_options; > extern void irq_trans_init(struct device_node *dp); > extern char *build_path_component(struct device_node *dp); > > +/* SPARC has a local implementation */ > +extern int of_address_to_resource(struct device_node *dev, int index, > + struct resource *r); > +#define of_address_to_resource of_address_to_resource > + > #endif /* __KERNEL__ */ > #endif /* _SPARC_PROM_H */ > diff --git a/include/linux/of_address.h b/include/linux/of_address.h > index a1984dd..e20e3af 100644 > --- a/include/linux/of_address.h > +++ b/include/linux/of_address.h > @@ -28,11 +28,13 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } > #endif > > #else /* CONFIG_OF_ADDRESS */ > +#ifndef of_address_to_resource > static inline int of_address_to_resource(struct device_node *dev, int index, > struct resource *r) > { > return -EINVAL; > } > +#endif > static inline struct device_node *of_find_matching_node_by_address( > struct device_node *from, > const struct of_device_id *matches, >