Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c7b60cb authored by Grant Likely's avatar Grant Likely
Browse files

of: put default string compare and #a/s-cell values into common header 



Most architectures don't need to change these.  Put them into common
code to eliminate some duplication

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
parent 4ef7b373

arch/microblaze/include/asm/prom.h

+0 −7
Original line number Diff line number Diff line
@@ -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

arch/powerpc/include/asm/prom.h

+0 −7
Original line number Diff line number Diff line
@@ -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

include/linux/of.h

+13 −0
Original line number Diff line number Diff line
@@ -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 */