|
|
@@ -78,7 +78,6 @@ void of_device_make_bus_id(struct device *dev)
|
|
|
struct device_node *node = dev->of_node;
|
|
|
const __be32 *reg;
|
|
|
u64 addr;
|
|
|
- const __be32 *addrp;
|
|
|
int magic;
|
|
|
|
|
|
#ifdef CONFIG_PPC_DCR
|
|
|
@@ -106,15 +105,7 @@ void of_device_make_bus_id(struct device *dev)
|
|
|
*/
|
|
|
reg = of_get_property(node, "reg", NULL);
|
|
|
if (reg) {
|
|
|
- if (of_can_translate_address(node)) {
|
|
|
- addr = of_translate_address(node, reg);
|
|
|
- } else {
|
|
|
- addrp = of_get_address(node, 0, NULL, NULL);
|
|
|
- if (addrp)
|
|
|
- addr = of_read_number(addrp, 1);
|
|
|
- else
|
|
|
- addr = OF_BAD_ADDR;
|
|
|
- }
|
|
|
+ addr = of_translate_address(node, reg);
|
|
|
if (addr != OF_BAD_ADDR) {
|
|
|
dev_set_name(dev, "%llx.%s",
|
|
|
(unsigned long long)addr, node->name);
|