Commit 923f7e30 authored by Grant Likely's avatar Grant Likely
Browse files

of: Merge of_node_get() and of_node_put() 



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 1f43cfb9

arch/microblaze/kernel/prom.c

+0 −74
Original line number Diff line number Diff line
@@ -350,80 +350,6 @@ struct device_node *of_find_node_by_phandle(phandle handle) 
}

EXPORT_SYMBOL(of_find_node_by_phandle);



/**

 *	of_node_get - Increment refcount of a node

 *	@node:	Node to inc refcount, NULL is supported to

 *		simplify writing of callers

 *

 *	Returns node.

 */

struct device_node *of_node_get(struct device_node *node)

{

	if (node)

		kref_get(&node->kref);

	return node;

}

EXPORT_SYMBOL(of_node_get);



static inline struct device_node *kref_to_device_node(struct kref *kref)

{

	return container_of(kref, struct device_node, kref);

}



/**

 *	of_node_release - release a dynamically allocated node

 *	@kref:  kref element of the node to be released

 *

 *	In of_node_put() this function is passed to kref_put()

 *	as the destructor.

 */

static void of_node_release(struct kref *kref)

{

	struct device_node *node = kref_to_device_node(kref);

	struct property *prop = node->properties;



	/* We should never be releasing nodes that haven't been detached. */

	if (!of_node_check_flag(node, OF_DETACHED)) {

		printk(KERN_INFO "WARNING: Bad of_node_put() on %s\n",

			node->full_name);

		dump_stack();

		kref_init(&node->kref);

		return;

	}



	if (!of_node_check_flag(node, OF_DYNAMIC))

		return;



	while (prop) {

		struct property *next = prop->next;

		kfree(prop->name);

		kfree(prop->value);

		kfree(prop);

		prop = next;



		if (!prop) {

			prop = node->deadprops;

			node->deadprops = NULL;

		}

	}

	kfree(node->full_name);

	kfree(node->data);

	kfree(node);

}



/**

 *	of_node_put - Decrement refcount of a node

 *	@node:	Node to dec refcount, NULL is supported to

 *		simplify writing of callers

 *

 */

void of_node_put(struct device_node *node)

{

	if (node)

		kref_put(&node->kref, of_node_release);

}

EXPORT_SYMBOL(of_node_put);



/*

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

 */

arch/powerpc/kernel/prom.c

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

}



/**

 *	of_node_get - Increment refcount of a node

 *	@node:	Node to inc refcount, NULL is supported to

 *		simplify writing of callers

 *

 *	Returns node.

 */

struct device_node *of_node_get(struct device_node *node)

{

	if (node)

		kref_get(&node->kref);

	return node;

}

EXPORT_SYMBOL(of_node_get);



static inline struct device_node * kref_to_device_node(struct kref *kref)

{

	return container_of(kref, struct device_node, kref);

}



/**

 *	of_node_release - release a dynamically allocated node

 *	@kref:  kref element of the node to be released

 *

 *	In of_node_put() this function is passed to kref_put()

 *	as the destructor.

 */

static void of_node_release(struct kref *kref)

{

	struct device_node *node = kref_to_device_node(kref);

	struct property *prop = node->properties;



	/* We should never be releasing nodes that haven't been detached. */

	if (!of_node_check_flag(node, OF_DETACHED)) {

		printk("WARNING: Bad of_node_put() on %s\n", node->full_name);

		dump_stack();

		kref_init(&node->kref);

		return;

	}



	if (!of_node_check_flag(node, OF_DYNAMIC))

		return;



	while (prop) {

		struct property *next = prop->next;

		kfree(prop->name);

		kfree(prop->value);

		kfree(prop);

		prop = next;



		if (!prop) {

			prop = node->deadprops;

			node->deadprops = NULL;

		}

	}

	kfree(node->full_name);

	kfree(node->data);

	kfree(node);

}



/**

 *	of_node_put - Decrement refcount of a node

 *	@node:	Node to dec refcount, NULL is supported to

 *		simplify writing of callers

 *

 */

void of_node_put(struct device_node *node)

{

	if (node)

		kref_put(&node->kref, of_node_release);

}

EXPORT_SYMBOL(of_node_put);



/*

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

 */

drivers/of/base.c

+75 −0
Original line number Diff line number Diff line
@@ -60,6 +60,81 @@ int of_n_size_cells(struct device_node *np) 
}

EXPORT_SYMBOL(of_n_size_cells);



#if !defined(CONFIG_SPARC)   /* SPARC doesn't do ref counting (yet) */

/**

 *	of_node_get - Increment refcount of a node

 *	@node:	Node to inc refcount, NULL is supported to

 *		simplify writing of callers

 *

 *	Returns node.

 */

struct device_node *of_node_get(struct device_node *node)

{

	if (node)

		kref_get(&node->kref);

	return node;

}

EXPORT_SYMBOL(of_node_get);



static inline struct device_node *kref_to_device_node(struct kref *kref)

{

	return container_of(kref, struct device_node, kref);

}



/**

 *	of_node_release - release a dynamically allocated node

 *	@kref:  kref element of the node to be released

 *

 *	In of_node_put() this function is passed to kref_put()

 *	as the destructor.

 */

static void of_node_release(struct kref *kref)

{

	struct device_node *node = kref_to_device_node(kref);

	struct property *prop = node->properties;



	/* We should never be releasing nodes that haven't been detached. */

	if (!of_node_check_flag(node, OF_DETACHED)) {

		pr_err("ERROR: Bad of_node_put() on %s\n", node->full_name);

		dump_stack();

		kref_init(&node->kref);

		return;

	}



	if (!of_node_check_flag(node, OF_DYNAMIC))

		return;



	while (prop) {

		struct property *next = prop->next;

		kfree(prop->name);

		kfree(prop->value);

		kfree(prop);

		prop = next;



		if (!prop) {

			prop = node->deadprops;

			node->deadprops = NULL;

		}

	}

	kfree(node->full_name);

	kfree(node->data);

	kfree(node);

}



/**

 *	of_node_put - Decrement refcount of a node

 *	@node:	Node to dec refcount, NULL is supported to

 *		simplify writing of callers

 *

 */

void of_node_put(struct device_node *node)

{

	if (node)

		kref_put(&node->kref, of_node_release);

}

EXPORT_SYMBOL(of_node_put);

#endif /* !CONFIG_SPARC */



struct property *of_find_property(const struct device_node *np,

				  const char *name,

				  int *lenp)