diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 23 | ||||
-rw-r--r-- | arch/powerpc/kernel/prom.c | 24 |
2 files changed, 0 insertions, 47 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 7959495b1d00..189179a9b554 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -42,9 +42,6 @@ | |||
42 | #include <asm/sections.h> | 42 | #include <asm/sections.h> |
43 | #include <asm/pci-bridge.h> | 43 | #include <asm/pci-bridge.h> |
44 | 44 | ||
45 | static int __initdata dt_root_addr_cells; | ||
46 | static int __initdata dt_root_size_cells; | ||
47 | |||
48 | typedef u32 cell_t; | 45 | typedef u32 cell_t; |
49 | 46 | ||
50 | /* export that to outside world */ | 47 | /* export that to outside world */ |
@@ -158,26 +155,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
158 | return 1; | 155 | return 1; |
159 | } | 156 | } |
160 | 157 | ||
161 | static int __init early_init_dt_scan_root(unsigned long node, | ||
162 | const char *uname, int depth, void *data) | ||
163 | { | ||
164 | u32 *prop; | ||
165 | |||
166 | if (depth != 0) | ||
167 | return 0; | ||
168 | |||
169 | prop = of_get_flat_dt_prop(node, "#size-cells", NULL); | ||
170 | dt_root_size_cells = (prop == NULL) ? 1 : *prop; | ||
171 | pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells); | ||
172 | |||
173 | prop = of_get_flat_dt_prop(node, "#address-cells", NULL); | ||
174 | dt_root_addr_cells = (prop == NULL) ? 2 : *prop; | ||
175 | pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells); | ||
176 | |||
177 | /* break now */ | ||
178 | return 1; | ||
179 | } | ||
180 | |||
181 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) | 158 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) |
182 | { | 159 | { |
183 | cell_t *p = *cellp; | 160 | cell_t *p = *cellp; |
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 1ecd6c6ecabd..78f65a4d8b03 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -61,10 +61,6 @@ | |||
61 | #define DBG(fmt...) | 61 | #define DBG(fmt...) |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | |||
65 | static int __initdata dt_root_addr_cells; | ||
66 | static int __initdata dt_root_size_cells; | ||
67 | |||
68 | #ifdef CONFIG_PPC64 | 64 | #ifdef CONFIG_PPC64 |
69 | int __initdata iommu_is_off; | 65 | int __initdata iommu_is_off; |
70 | int __initdata iommu_force_on; | 66 | int __initdata iommu_force_on; |
@@ -436,26 +432,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
436 | return 1; | 432 | return 1; |
437 | } | 433 | } |
438 | 434 | ||
439 | static int __init early_init_dt_scan_root(unsigned long node, | ||
440 | const char *uname, int depth, void *data) | ||
441 | { | ||
442 | u32 *prop; | ||
443 | |||
444 | if (depth != 0) | ||
445 | return 0; | ||
446 | |||
447 | prop = of_get_flat_dt_prop(node, "#size-cells", NULL); | ||
448 | dt_root_size_cells = (prop == NULL) ? 1 : *prop; | ||
449 | DBG("dt_root_size_cells = %x\n", dt_root_size_cells); | ||
450 | |||
451 | prop = of_get_flat_dt_prop(node, "#address-cells", NULL); | ||
452 | dt_root_addr_cells = (prop == NULL) ? 2 : *prop; | ||
453 | DBG("dt_root_addr_cells = %x\n", dt_root_addr_cells); | ||
454 | |||
455 | /* break now */ | ||
456 | return 1; | ||
457 | } | ||
458 | |||
459 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) | 435 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) |
460 | { | 436 | { |
461 | cell_t *p = *cellp; | 437 | cell_t *p = *cellp; |