Commit e5ff0fe3 authored by David S. Miller's avatar David S. Miller

sparc: Move 'unique_id' into prom_common.c and rename to 'prom_unique_id'

This will be used in a subsequent changeset.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fce09c6
...@@ -13,4 +13,6 @@ extern void * prom_early_alloc(unsigned long size); ...@@ -13,4 +13,6 @@ extern void * prom_early_alloc(unsigned long size);
extern void irq_trans_init(struct device_node *dp); extern void irq_trans_init(struct device_node *dp);
#endif #endif
extern unsigned int prom_unique_id;
#endif /* __PROM_H */ #endif /* __PROM_H */
...@@ -196,8 +196,6 @@ static char * __init build_full_name(struct device_node *dp) ...@@ -196,8 +196,6 @@ static char * __init build_full_name(struct device_node *dp)
return n; return n;
} }
static unsigned int unique_id;
static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len) static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
{ {
static struct property *tmp = NULL; static struct property *tmp = NULL;
...@@ -211,7 +209,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s ...@@ -211,7 +209,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
tmp = NULL; tmp = NULL;
} else { } else {
p = prom_early_alloc(sizeof(struct property) + 32); p = prom_early_alloc(sizeof(struct property) + 32);
p->unique_id = unique_id++; p->unique_id = prom_unique_id++;
} }
p->name = (char *) (p + 1); p->name = (char *) (p + 1);
...@@ -286,7 +284,7 @@ static struct device_node * __init create_node(phandle node) ...@@ -286,7 +284,7 @@ static struct device_node * __init create_node(phandle node)
return NULL; return NULL;
dp = prom_early_alloc(sizeof(*dp)); dp = prom_early_alloc(sizeof(*dp));
dp->unique_id = unique_id++; dp->unique_id = prom_unique_id++;
kref_init(&dp->kref); kref_init(&dp->kref);
......
...@@ -399,8 +399,6 @@ static char * __init build_full_name(struct device_node *dp) ...@@ -399,8 +399,6 @@ static char * __init build_full_name(struct device_node *dp)
return n; return n;
} }
static unsigned int unique_id;
static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len) static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
{ {
static struct property *tmp = NULL; static struct property *tmp = NULL;
...@@ -412,7 +410,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s ...@@ -412,7 +410,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
tmp = NULL; tmp = NULL;
} else { } else {
p = prom_early_alloc(sizeof(struct property) + 32); p = prom_early_alloc(sizeof(struct property) + 32);
p->unique_id = unique_id++; p->unique_id = prom_unique_id++;
} }
p->name = (char *) (p + 1); p->name = (char *) (p + 1);
...@@ -483,7 +481,7 @@ static struct device_node * __init create_node(phandle node, struct device_node ...@@ -483,7 +481,7 @@ static struct device_node * __init create_node(phandle node, struct device_node
return NULL; return NULL;
dp = prom_early_alloc(sizeof(*dp)); dp = prom_early_alloc(sizeof(*dp));
dp->unique_id = unique_id++; dp->unique_id = prom_unique_id++;
dp->parent = parent; dp->parent = parent;
kref_init(&dp->kref); kref_init(&dp->kref);
......
...@@ -119,3 +119,4 @@ int of_find_in_proplist(const char *list, const char *match, int len) ...@@ -119,3 +119,4 @@ int of_find_in_proplist(const char *list, const char *match, int len)
} }
EXPORT_SYMBOL(of_find_in_proplist); EXPORT_SYMBOL(of_find_in_proplist);
unsigned int prom_unique_id;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment