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

Commit 035ebefc authored by Andres Salomon's avatar Andres Salomon Committed by Grant Likely
Browse files

of/sparc: move is_root_node() to of.h 



Rename is_root_node() to of_node_is_root() and make it available for
all archs to use, as it's not PROM-specific.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent ef2a4524

arch/sparc/kernel/prom.h

+0 −8
Original line number Diff line number Diff line
@@ -9,14 +9,6 @@ extern void irq_trans_init(struct device_node *dp); 


extern unsigned int prom_unique_id;



static inline int is_root_node(const struct device_node *dp)

{

	if (!dp)

		return 0;



	return (dp->parent == NULL);

}



extern char *build_path_component(struct device_node *dp);

extern void of_console_init(void);

arch/sparc/kernel/prom_64.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/mm.h>

#include <linux/module.h>

#include <linux/lmb.h>

#include <linux/of_device.h>

#include <linux/of.h>



#include <asm/prom.h>

#include <asm/oplib.h>
@@ -81,7 +81,7 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf) 
		return;



	regs = rprop->value;

	if (!is_root_node(dp->parent)) {

	if (!of_node_is_root(dp->parent)) {

		sprintf(tmp_buf, "%s@%x,%x",

			dp->name,

			(unsigned int) (regs->phys_addr >> 32UL),
@@ -121,7 +121,7 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf) 
		return;



	regs = prop->value;

	if (!is_root_node(dp->parent)) {

	if (!of_node_is_root(dp->parent)) {

		sprintf(tmp_buf, "%s@%x,%x",

			dp->name,

			(unsigned int) (regs->phys_addr >> 32UL),

arch/sparc/kernel/prom_common.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ char * __init build_full_name(struct device_node *dp) 


	n = prom_early_alloc(len);

	strcpy(n, dp->parent->full_name);

	if (!is_root_node(dp->parent)) {

	if (!of_node_is_root(dp->parent)) {

		strcpy(n + plen, "/");

		plen++;

	}

include/linux/of.h

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ extern struct device_node *allnodes; 
extern struct device_node *of_chosen;

extern rwlock_t devtree_lock;



static inline bool of_node_is_root(const struct device_node *node)

{

	return node && (node->parent == NULL);

}



static inline int of_node_check_flag(struct device_node *n, unsigned long flag)

{

	return test_bit(flag, &n->_flags);