Skip to content

Commit

Permalink
[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.
Browse files Browse the repository at this point in the history
One thing this change pointed out was that we really should
pull the "get 'local-mac-address' property" logic into a helper
function all the network drivers can call.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jun 24, 2006
1 parent 765b5f3 commit de8d28b
Show file tree
Hide file tree
Showing 17 changed files with 182 additions and 134 deletions.
6 changes: 3 additions & 3 deletions arch/sparc64/kernel/ebus.c
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ void __init ebus_init(void)
}

cookie = pdev->sysdata;
ebusnd = cookie->prom_node;
ebusnd = cookie->prom_node->node;

ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus));
ebus->next = NULL;
Expand All @@ -578,7 +578,7 @@ void __init ebus_init(void)
}
ebus->is_rio = is_rio;
cookie = pdev->sysdata;
ebusnd = cookie->prom_node;
ebusnd = cookie->prom_node->node;
continue;
}
printk("ebus%d:", num_ebus);
Expand Down Expand Up @@ -622,7 +622,7 @@ void __init ebus_init(void)
break;

cookie = pdev->sysdata;
ebusnd = cookie->prom_node;
ebusnd = cookie->prom_node->node;

ebus->next = ebus_alloc(sizeof(struct linux_ebus));
ebus = ebus->next;
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc64/kernel/isa.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ void __init isa_init(void)
isa_br->parent = pbm;
isa_br->self = pdev;
isa_br->index = index++;
isa_br->prom_node = pdev_cookie->prom_node;
strncpy(isa_br->prom_name, pdev_cookie->prom_name,
isa_br->prom_node = pdev_cookie->prom_node->node;
strncpy(isa_br->prom_name, pdev_cookie->prom_node->name,
sizeof(isa_br->prom_name));

prop_len = prom_getproperty(isa_br->prom_node,
Expand Down
Loading

0 comments on commit de8d28b

Please sign in to comment.