diff options
Diffstat (limited to 'arch/powerpc/kernel/of_platform.c')
-rw-r--r-- | arch/powerpc/kernel/of_platform.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index b7345176b399..908ed7926db4 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
@@ -133,6 +133,7 @@ static int of_platform_device_resume(struct device * dev) | |||
133 | struct bus_type of_platform_bus_type = { | 133 | struct bus_type of_platform_bus_type = { |
134 | .name = "of_platform", | 134 | .name = "of_platform", |
135 | .match = of_platform_bus_match, | 135 | .match = of_platform_bus_match, |
136 | .uevent = of_device_uevent, | ||
136 | .probe = of_platform_device_probe, | 137 | .probe = of_platform_device_probe, |
137 | .remove = of_platform_device_remove, | 138 | .remove = of_platform_device_remove, |
138 | .suspend = of_platform_device_suspend, | 139 | .suspend = of_platform_device_suspend, |
@@ -177,7 +178,7 @@ static void of_platform_make_bus_id(struct of_device *dev) | |||
177 | * and 'D' for MMIO DCRs. | 178 | * and 'D' for MMIO DCRs. |
178 | */ | 179 | */ |
179 | #ifdef CONFIG_PPC_DCR | 180 | #ifdef CONFIG_PPC_DCR |
180 | reg = get_property(node, "dcr-reg", NULL); | 181 | reg = of_get_property(node, "dcr-reg", NULL); |
181 | if (reg) { | 182 | if (reg) { |
182 | #ifdef CONFIG_PPC_DCR_NATIVE | 183 | #ifdef CONFIG_PPC_DCR_NATIVE |
183 | snprintf(name, BUS_ID_SIZE, "d%x.%s", | 184 | snprintf(name, BUS_ID_SIZE, "d%x.%s", |
@@ -197,7 +198,7 @@ static void of_platform_make_bus_id(struct of_device *dev) | |||
197 | /* | 198 | /* |
198 | * For MMIO, get the physical address | 199 | * For MMIO, get the physical address |
199 | */ | 200 | */ |
200 | reg = get_property(node, "reg", NULL); | 201 | reg = of_get_property(node, "reg", NULL); |
201 | if (reg) { | 202 | if (reg) { |
202 | addr = of_translate_address(node, reg); | 203 | addr = of_translate_address(node, reg); |
203 | if (addr != OF_BAD_ADDR) { | 204 | if (addr != OF_BAD_ADDR) { |
@@ -475,9 +476,6 @@ static struct of_platform_driver of_pci_phb_driver = { | |||
475 | .name = "of-pci", | 476 | .name = "of-pci", |
476 | .match_table = of_pci_phb_ids, | 477 | .match_table = of_pci_phb_ids, |
477 | .probe = of_pci_phb_probe, | 478 | .probe = of_pci_phb_probe, |
478 | .driver = { | ||
479 | .multithread_probe = 1, | ||
480 | }, | ||
481 | }; | 479 | }; |
482 | 480 | ||
483 | static __init int of_pci_phb_init(void) | 481 | static __init int of_pci_phb_init(void) |