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

Commit 526b5b3e authored by Grant Likely's avatar Grant Likely
Browse files

of: merge of_node_get(), of_node_put() and of_find_all_nodes() 



Merge common code between Sparc, PowerPC and Microblaze.

Sparc differs in the implementation at this point, so this patch uses
a #ifdef to handle sparc differently for now.  The merging of
implementations will occur in a later patch

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarStephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent b6caf2ad

arch/microblaze/include/asm/prom.h

+0 −4
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ extern struct device_node *of_chosen; 
extern struct device_node *allnodes;	/* temporary while merging */

extern rwlock_t devtree_lock;	/* temporary while merging */



extern struct device_node *of_find_all_nodes(struct device_node *prev);

extern struct device_node *of_node_get(struct device_node *node);

extern void of_node_put(struct device_node *node);



/* For scanning the flat device-tree at boot time */

extern int __init of_scan_flat_dt(int (*it)(unsigned long node,

					const char *uname, int depth,

arch/powerpc/include/asm/prom.h

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ extern struct device_node *of_chosen; 


#define HAVE_ARCH_DEVTREE_FIXUPS



extern struct device_node *of_find_all_nodes(struct device_node *prev);

extern struct device_node *of_node_get(struct device_node *node);

extern void of_node_put(struct device_node *node);



/* For scanning the flat device-tree at boot time */

extern int __init of_scan_flat_dt(int (*it)(unsigned long node,

					    const char *uname, int depth,

arch/sparc/include/asm/prom.h

+0 −9
Original line number Diff line number Diff line
@@ -51,15 +51,6 @@ extern void prom_build_devicetree(void); 
extern void of_populate_present_mask(void);

extern void of_fill_in_cpu_data(void);



/* Dummy ref counting routines - to be implemented later */

static inline struct device_node *of_node_get(struct device_node *node)

{

	return node;

}

static inline void of_node_put(struct device_node *node)

{

}



/* These routines are here to provide compatibility with how powerpc

 * handles IRQ mapping for OF device nodes.  We precompute and permanently

 * register them in the of_device objects, whereas powerpc computes them

include/linux/of.h

+16 −0
Original line number Diff line number Diff line
@@ -79,6 +79,22 @@ set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) 
	dn->pde = de;

}



#if defined(CONFIG_SPARC)

/* Dummy ref counting routines - to be implemented later */

static inline struct device_node *of_node_get(struct device_node *node)

{

	return node;

}

static inline void of_node_put(struct device_node *node)

{

}



#else

extern struct device_node *of_find_all_nodes(struct device_node *prev);

extern struct device_node *of_node_get(struct device_node *node);

extern void of_node_put(struct device_node *node);

#endif



/*

 * OF address retreival & translation

 */