Skip to content

Commit

Permalink
Consolidate of_get_parent
Browse files Browse the repository at this point in the history
This requires creating dummy of_node_{get,put} routines for sparc and
sparc64.  It also adds a read_lock around the parent accesses.

Signed-off-by: Stephen Rothwell <[email protected]>
Acked-by: Paul Mackerras <[email protected]>
Acked-by: David S. Miller <[email protected]>
  • Loading branch information
sfrothwell committed Jul 20, 2007
1 parent 581b605 commit e679c5f
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 47 deletions.
21 changes: 0 additions & 21 deletions arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1240,27 +1240,6 @@ struct device_node *of_find_all_nodes(struct device_node *prev)
}
EXPORT_SYMBOL(of_find_all_nodes);

/**
* of_get_parent - Get a node's parent if any
* @node: Node to get parent
*
* Returns a node pointer with refcount incremented, use
* of_node_put() on it when done.
*/
struct device_node *of_get_parent(const struct device_node *node)
{
struct device_node *np;

if (!node)
return NULL;

read_lock(&devtree_lock);
np = of_node_get(node->parent);
read_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_get_parent);

/**
* of_get_next_child - Iterate a node childs
* @node: parent node
Expand Down
13 changes: 0 additions & 13 deletions arch/sparc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,6 @@ static struct device_node *allnodes;

extern rwlock_t devtree_lock; /* temporary while merging */

struct device_node *of_get_parent(const struct device_node *node)
{
struct device_node *np;

if (!node)
return NULL;

np = node->parent;

return np;
}
EXPORT_SYMBOL(of_get_parent);

struct device_node *of_get_next_child(const struct device_node *node,
struct device_node *prev)
{
Expand Down
13 changes: 0 additions & 13 deletions arch/sparc64/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@ static struct device_node *allnodes;

extern rwlock_t devtree_lock; /* temporary while merging */

struct device_node *of_get_parent(const struct device_node *node)
{
struct device_node *np;

if (!node)
return NULL;

np = node->parent;

return np;
}
EXPORT_SYMBOL(of_get_parent);

struct device_node *of_get_next_child(const struct device_node *node,
struct device_node *prev)
{
Expand Down
21 changes: 21 additions & 0 deletions drivers/of/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,24 @@ int of_device_is_compatible(const struct device_node *device,
return 0;
}
EXPORT_SYMBOL(of_device_is_compatible);

/**
* of_get_parent - Get a node's parent if any
* @node: Node to get parent
*
* Returns a node pointer with refcount incremented, use
* of_node_put() on it when done.
*/
struct device_node *of_get_parent(const struct device_node *node)
{
struct device_node *np;

if (!node)
return NULL;

read_lock(&devtree_lock);
np = of_node_get(node->parent);
read_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_get_parent);
9 changes: 9 additions & 0 deletions include/asm-sparc/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ extern int of_getintprop_default(struct device_node *np,

extern void prom_build_devicetree(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)
{
}

/*
* NB: This is here while we transition from using asm/prom.h
* to linux/of.h
Expand Down
9 changes: 9 additions & 0 deletions include/asm-sparc64/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ extern int of_getintprop_default(struct device_node *np,

extern void prom_build_devicetree(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)
{
}

/*
* NB: This is here while we transition from using asm/prom.h
* to linux/of.h
Expand Down

0 comments on commit e679c5f

Please sign in to comment.