aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/prom_64.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-05 04:00:46 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-05 20:04:22 -0500
commitb9e5567cda6387e0f4061bfceebbc1bd63ee42a6 (patch)
tree0c7cc9f46f65b943fe8065ba2b3af31a3bbf06b1 /arch/sparc/kernel/prom_64.c
parente5ff0fe31d69e716f2599bcfb297ca3757e957c5 (diff)
sparc: Move property building code into prom_common.c
Unfortunately there is some sparc32/sparc64 ifdef'ery in here due to the difference in how the prom_firstprop() and prom_nextprop() routines work. This will be eliminated eventually. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/prom_64.c')
-rw-r--r--arch/sparc/kernel/prom_64.c60
1 files changed, 0 insertions, 60 deletions
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 61cc967b149..e3969db4d58 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -399,66 +399,6 @@ static char * __init build_full_name(struct device_node *dp)
399 return n; 399 return n;
400} 400}
401 401
402static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
403{
404 static struct property *tmp = NULL;
405 struct property *p;
406
407 if (tmp) {
408 p = tmp;
409 memset(p, 0, sizeof(*p) + 32);
410 tmp = NULL;
411 } else {
412 p = prom_early_alloc(sizeof(struct property) + 32);
413 p->unique_id = prom_unique_id++;
414 }
415
416 p->name = (char *) (p + 1);
417 if (special_name) {
418 strcpy(p->name, special_name);
419 p->length = special_len;
420 p->value = prom_early_alloc(special_len);
421 memcpy(p->value, special_val, special_len);
422 } else {
423 if (prev == NULL) {
424 prom_firstprop(node, p->name);
425 } else {
426 prom_nextprop(node, prev, p->name);
427 }
428 if (strlen(p->name) == 0) {
429 tmp = p;
430 return NULL;
431 }
432 p->length = prom_getproplen(node, p->name);
433 if (p->length <= 0) {
434 p->length = 0;
435 } else {
436 p->value = prom_early_alloc(p->length + 1);
437 prom_getproperty(node, p->name, p->value, p->length);
438 ((unsigned char *)p->value)[p->length] = '\0';
439 }
440 }
441 return p;
442}
443
444static struct property * __init build_prop_list(phandle node)
445{
446 struct property *head, *tail;
447
448 head = tail = build_one_prop(node, NULL,
449 ".node", &node, sizeof(node));
450
451 tail->next = build_one_prop(node, NULL, NULL, NULL, 0);
452 tail = tail->next;
453 while(tail) {
454 tail->next = build_one_prop(node, tail->name,
455 NULL, NULL, 0);
456 tail = tail->next;
457 }
458
459 return head;
460}
461
462static char * __init get_one_property(phandle node, const char *name) 402static char * __init get_one_property(phandle node, const char *name)
463{ 403{
464 char *buf = "<NULL>"; 404 char *buf = "<NULL>";