diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-08-30 18:06:53 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 12:39:01 -0400 |
commit | 29eb45a9ab4839a1e9cef2bcf369b918c9c4fcad (patch) | |
tree | 00893156dab39f9e739ab9055dd163a2a547d721 /drivers/of | |
parent | ec2eaa73b3d21776f46797a2eef983d7be09a964 (diff) |
of: remove early_init_dt_setup_initrd_arch
All arches do essentially the same thing now for
early_init_dt_setup_initrd_arch, so it can now be removed.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/fdt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 5bc55b6e2b41..5f4cc88cd89e 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c | |||
@@ -624,7 +624,7 @@ int __init of_scan_flat_dt_by_path(const char *path, | |||
624 | * early_init_dt_check_for_initrd - Decode initrd location from flat tree | 624 | * early_init_dt_check_for_initrd - Decode initrd location from flat tree |
625 | * @node: reference to node containing initrd location ('chosen') | 625 | * @node: reference to node containing initrd location ('chosen') |
626 | */ | 626 | */ |
627 | void __init early_init_dt_check_for_initrd(unsigned long node) | 627 | static void __init early_init_dt_check_for_initrd(unsigned long node) |
628 | { | 628 | { |
629 | u64 start, end; | 629 | u64 start, end; |
630 | unsigned long len; | 630 | unsigned long len; |
@@ -642,12 +642,15 @@ void __init early_init_dt_check_for_initrd(unsigned long node) | |||
642 | return; | 642 | return; |
643 | end = of_read_number(prop, len/4); | 643 | end = of_read_number(prop, len/4); |
644 | 644 | ||
645 | early_init_dt_setup_initrd_arch(start, end); | 645 | initrd_start = (unsigned long)__va(start); |
646 | initrd_end = (unsigned long)__va(end); | ||
647 | initrd_below_start_ok = 1; | ||
648 | |||
646 | pr_debug("initrd_start=0x%llx initrd_end=0x%llx\n", | 649 | pr_debug("initrd_start=0x%llx initrd_end=0x%llx\n", |
647 | (unsigned long long)start, (unsigned long long)end); | 650 | (unsigned long long)start, (unsigned long long)end); |
648 | } | 651 | } |
649 | #else | 652 | #else |
650 | inline void early_init_dt_check_for_initrd(unsigned long node) | 653 | static inline void early_init_dt_check_for_initrd(unsigned long node) |
651 | { | 654 | { |
652 | } | 655 | } |
653 | #endif /* CONFIG_BLK_DEV_INITRD */ | 656 | #endif /* CONFIG_BLK_DEV_INITRD */ |