Skip to content

Commit

Permalink
of/promtree: add of_pdt namespace to pdt code
Browse files Browse the repository at this point in the history 
For symbols still lacking namespace qualifiers, add an of_pdt_ prefix.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Andres Salomon authored and Grant Likely committed Oct 13, 2010
1 parent f90c34b commit ed41850
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/kernel/leon_kernel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,5 +282,5 @@ void __init leon_init_IRQ(void)

void __init leon_init(void)
{
prom_build_more = &leon_node_init;
of_pdt_build_more = &leon_node_init;
}
40 changes: 20 additions & 20 deletions drivers/of/pdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

static struct of_pdt_ops *of_pdt_prom_ops __initdata;

void __initdata (*prom_build_more)(struct device_node *dp,
void __initdata (*of_pdt_build_more)(struct device_node *dp,
struct device_node ***nextp);

#if defined(CONFIG_SPARC)
Expand All @@ -53,7 +53,7 @@ static inline const char *of_pdt_node_name(struct device_node *dp)

#endif /* !CONFIG_SPARC */

static struct property * __init build_one_prop(phandle node, char *prev,
static struct property * __init of_pdt_build_one_prop(phandle node, char *prev,
char *special_name,
void *special_val,
int special_len)
Expand Down Expand Up @@ -100,25 +100,25 @@ static struct property * __init build_one_prop(phandle node, char *prev,
return p;
}

static struct property * __init build_prop_list(phandle node)
static struct property * __init of_pdt_build_prop_list(phandle node)
{
struct property *head, *tail;

head = tail = build_one_prop(node, NULL,
head = tail = of_pdt_build_one_prop(node, NULL,
".node", &node, sizeof(node));

tail->next = build_one_prop(node, NULL, NULL, NULL, 0);
tail->next = of_pdt_build_one_prop(node, NULL, NULL, NULL, 0);
tail = tail->next;
while(tail) {
tail->next = build_one_prop(node, tail->name,
tail->next = of_pdt_build_one_prop(node, tail->name,
NULL, NULL, 0);
tail = tail->next;
}

return head;
}

static char * __init get_one_property(phandle node, const char *name)
static char * __init of_pdt_get_one_property(phandle node, const char *name)
{
char *buf = "<NULL>";
int len;
Expand All @@ -132,7 +132,7 @@ static char * __init get_one_property(phandle node, const char *name)
return buf;
}

static struct device_node * __init prom_create_node(phandle node,
static struct device_node * __init of_pdt_create_node(phandle node,
struct device_node *parent)
{
struct device_node *dp;
Expand All @@ -146,18 +146,18 @@ static struct device_node * __init prom_create_node(phandle node,

kref_init(&dp->kref);

dp->name = get_one_property(node, "name");
dp->type = get_one_property(node, "device_type");
dp->name = of_pdt_get_one_property(node, "name");
dp->type = of_pdt_get_one_property(node, "device_type");
dp->phandle = node;

dp->properties = build_prop_list(node);
dp->properties = of_pdt_build_prop_list(node);

irq_trans_init(dp);

return dp;
}

static char * __init build_full_name(struct device_node *dp)
static char * __init of_pdt_build_full_name(struct device_node *dp)
{
int len, ourlen, plen;
char *n;
Expand All @@ -177,15 +177,15 @@ static char * __init build_full_name(struct device_node *dp)
return n;
}

static struct device_node * __init prom_build_tree(struct device_node *parent,
static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
phandle node,
struct device_node ***nextp)
{
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;

while (1) {
dp = prom_create_node(node, parent);
dp = of_pdt_create_node(node, parent);
if (!dp)
break;

Expand All @@ -202,13 +202,13 @@ static struct device_node * __init prom_build_tree(struct device_node *parent,
#if defined(CONFIG_SPARC)
dp->path_component_name = build_path_component(dp);
#endif
dp->full_name = build_full_name(dp);
dp->full_name = of_pdt_build_full_name(dp);

dp->child = prom_build_tree(dp,
dp->child = of_pdt_build_tree(dp,
of_pdt_prom_ops->getchild(node), nextp);

if (prom_build_more)
prom_build_more(dp, nextp);
if (of_pdt_build_more)
of_pdt_build_more(dp, nextp);

node = of_pdt_prom_ops->getsibling(node);
}
Expand All @@ -223,13 +223,13 @@ void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops)
BUG_ON(!ops);
of_pdt_prom_ops = ops;

allnodes = prom_create_node(root_node, NULL);
allnodes = of_pdt_create_node(root_node, NULL);
#if defined(CONFIG_SPARC)
allnodes->path_component_name = "";
#endif
allnodes->full_name = "/";

nextp = &allnodes->allnext;
allnodes->child = prom_build_tree(allnodes,
allnodes->child = of_pdt_build_tree(allnodes,
of_pdt_prom_ops->getchild(allnodes->phandle), &nextp);
}
2 changes: 1 addition & 1 deletion include/linux/of_pdt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extern void *prom_early_alloc(unsigned long size);
/* for building the device tree */
extern void of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops);

extern void (*prom_build_more)(struct device_node *dp,
extern void (*of_pdt_build_more)(struct device_node *dp,
struct device_node ***nextp);

#endif /* _LINUX_OF_PDT_H */

0 comments on commit ed41850

Please sign in to comment.