From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0B93DB7DD7 for ; Sun, 14 Feb 2010 17:12:13 +1100 (EST) Subject: Re: [PATCH 5/9] of: put default string compare and #a/s-cell values into common header From: Benjamin Herrenschmidt To: Grant Likely In-Reply-To: <20100213160252.4767.94582.stgit@angua> References: <20100213154838.4767.83881.stgit@angua> <20100213160252.4767.94582.stgit@angua> Content-Type: text/plain; charset="UTF-8" Date: Sun, 14 Feb 2010 17:11:54 +1100 Message-ID: <1266127914.16346.62.camel@pasglop> Mime-Version: 1.0 Cc: sfr@canb.auug.org.au, monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, sparclinux@vger.kernel.org, jeremy.kerr@canonical.com, davem@davemloft.net List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Sat, 2010-02-13 at 09:02 -0700, Grant Likely wrote: > Most architectures don't need to change these. Put them into common > code to eliminate some duplication > > Signed-off-by: Grant Likely > --- Acked-by: Benjamin Herrenschmidt > > arch/microblaze/include/asm/prom.h | 7 ------- > arch/powerpc/include/asm/prom.h | 7 ------- > include/linux/of.h | 13 +++++++++++++ > 3 files changed, 13 insertions(+), 14 deletions(-) > > diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h > index 6c6b386..ddc5c57 100644 > --- a/arch/microblaze/include/asm/prom.h > +++ b/arch/microblaze/include/asm/prom.h > @@ -26,13 +26,6 @@ > #include > #include > > -#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1 > -#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 > - > -#define of_compat_cmp(s1, s2, l) strncasecmp((s1), (s2), (l)) > -#define of_prop_cmp(s1, s2) strcmp((s1), (s2)) > -#define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) > - > extern struct device_node *of_chosen; > > #define HAVE_ARCH_DEVTREE_FIXUPS > diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h > index f384db8..4a5070e 100644 > --- a/arch/powerpc/include/asm/prom.h > +++ b/arch/powerpc/include/asm/prom.h > @@ -23,13 +23,6 @@ > #include > #include > > -#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1 > -#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 > - > -#define of_compat_cmp(s1, s2, l) strcasecmp((s1), (s2)) > -#define of_prop_cmp(s1, s2) strcmp((s1), (s2)) > -#define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) > - > extern struct device_node *of_chosen; > > #define HAVE_ARCH_DEVTREE_FIXUPS > diff --git a/include/linux/of.h b/include/linux/of.h > index 48b0ee6..5cd2840 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -116,6 +116,19 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size) > > #include > > +/* Default #address and #size cells. Allow arch asm/prom.h to override */ > +#if !defined(OF_ROOT_NODE_ADDR_CELLS_DEFAULT) > +#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1 > +#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 > +#endif > + > +/* Default string compare functions, Allow arch asm/prom.h to override */ > +#if !defined(of_compat_cmp) > +#define of_compat_cmp(s1, s2, l) strncasecmp((s1), (s2), (l)) > +#define of_prop_cmp(s1, s2) strcmp((s1), (s2)) > +#define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) > +#endif > + > /* flag descriptions */ > #define OF_DYNAMIC 1 /* node and properties were allocated via kmalloc */ > #define OF_DETACHED 2 /* node has been detached from the device tree */ > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/