Commit fcdeb7fe authored by Grant Likely's avatar Grant Likely
Browse files

of: merge of_attach_node() & of_detach_node() 



Merge common code between PowerPC and Microblaze

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 58053714

arch/microblaze/include/asm/prom.h

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


extern rwlock_t devtree_lock;	/* temporary while merging */



/* For updating the device tree at runtime */

extern void of_attach_node(struct device_node *);

extern void of_detach_node(struct device_node *);



/* Other Prototypes */

extern int early_uartlite_console(void);

arch/microblaze/kernel/prom.c

+0 −59
Original line number Diff line number Diff line
@@ -197,65 +197,6 @@ struct device_node *of_find_node_by_phandle(phandle handle) 
}

EXPORT_SYMBOL(of_find_node_by_phandle);



/*

 * Plug a device node into the tree and global list.

 */

void of_attach_node(struct device_node *np)

{

	unsigned long flags;



	write_lock_irqsave(&devtree_lock, flags);

	np->sibling = np->parent->child;

	np->allnext = allnodes;

	np->parent->child = np;

	allnodes = np;

	write_unlock_irqrestore(&devtree_lock, flags);

}



/*

 * "Unplug" a node from the device tree.  The caller must hold

 * a reference to the node.  The memory associated with the node

 * is not freed until its refcount goes to zero.

 */

void of_detach_node(struct device_node *np)

{

	struct device_node *parent;

	unsigned long flags;



	write_lock_irqsave(&devtree_lock, flags);



	parent = np->parent;

	if (!parent)

		goto out_unlock;



	if (allnodes == np)

		allnodes = np->allnext;

	else {

		struct device_node *prev;

		for (prev = allnodes;

		     prev->allnext != np;

		     prev = prev->allnext)

			;

		prev->allnext = np->allnext;

	}



	if (parent->child == np)

		parent->child = np->sibling;

	else {

		struct device_node *prevsib;

		for (prevsib = np->parent->child;

		     prevsib->sibling != np;

		     prevsib = prevsib->sibling)

			;

		prevsib->sibling = np->sibling;

	}



	of_node_set_flag(np, OF_DETACHED);



out_unlock:

	write_unlock_irqrestore(&devtree_lock, flags);

}



#if defined(CONFIG_DEBUG_FS) && defined(DEBUG)

static struct debugfs_blob_wrapper flat_dt_blob;

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



/* For updating the device tree at runtime */

extern void of_attach_node(struct device_node *);

extern void of_detach_node(struct device_node *);



#ifdef CONFIG_PPC32

/*

 * PCI <-> OF matching functions

arch/powerpc/kernel/prom.c

+0 −59
Original line number Diff line number Diff line
@@ -817,65 +817,6 @@ struct device_node *of_find_next_cache_node(struct device_node *np) 
	return NULL;

}



/*

 * Plug a device node into the tree and global list.

 */

void of_attach_node(struct device_node *np)

{

	unsigned long flags;



	write_lock_irqsave(&devtree_lock, flags);

	np->sibling = np->parent->child;

	np->allnext = allnodes;

	np->parent->child = np;

	allnodes = np;

	write_unlock_irqrestore(&devtree_lock, flags);

}



/*

 * "Unplug" a node from the device tree.  The caller must hold

 * a reference to the node.  The memory associated with the node

 * is not freed until its refcount goes to zero.

 */

void of_detach_node(struct device_node *np)

{

	struct device_node *parent;

	unsigned long flags;



	write_lock_irqsave(&devtree_lock, flags);



	parent = np->parent;

	if (!parent)

		goto out_unlock;



	if (allnodes == np)

		allnodes = np->allnext;

	else {

		struct device_node *prev;

		for (prev = allnodes;

		     prev->allnext != np;

		     prev = prev->allnext)

			;

		prev->allnext = np->allnext;

	}



	if (parent->child == np)

		parent->child = np->sibling;

	else {

		struct device_node *prevsib;

		for (prevsib = np->parent->child;

		     prevsib->sibling != np;

		     prevsib = prevsib->sibling)

			;

		prevsib->sibling = np->sibling;

	}



	of_node_set_flag(np, OF_DETACHED);



out_unlock:

	write_unlock_irqrestore(&devtree_lock, flags);

}



#ifdef CONFIG_PPC_PSERIES

/*

 * Fix up the uninitialized fields in a new device node:

drivers/of/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ config OF_FLATTREE 
	bool

	depends on OF



config OF_DYNAMIC

	def_bool y

	depends on OF && PPC_OF



config OF_DEVICE

	def_bool y

	depends on OF && (SPARC || PPC_OF || MICROBLAZE)