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 <grant.likely@xxxxxxxxxxxx> > --- Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> > > 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 <asm/irq.h> > #include <asm/atomic.h> > > -#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 <asm/irq.h> > #include <asm/atomic.h> > > -#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 <asm/prom.h> > > +/* 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@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
