diff options
author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2016-06-01 02:53:01 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2016-06-23 16:00:29 -0400 |
commit | ddd0ce87bfdebbc92c639286a2bf1241f335e6c8 (patch) | |
tree | 1e33c7bc38813efde5a2c7c31c470105006a5df8 | |
parent | 17033917ce7b59fdc07f579693b083b39f08ff93 (diff) |
mips: Remove unnecessary of_platform_populate with default match table
After patch "of/platform: Add common method to populate default bus",
it is possible for arch code to remove unnecessary callers of
of_platform_populate with default match table.
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Joshua Henderson <joshua.henderson@microchip.com>
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | arch/mips/ath79/setup.c | 3 | ||||
-rw-r--r-- | arch/mips/jz4740/setup.c | 8 | ||||
-rw-r--r-- | arch/mips/mti-sead3/sead3-setup.c | 8 | ||||
-rw-r--r-- | arch/mips/pistachio/init.c | 13 | ||||
-rw-r--r-- | arch/mips/xilfpga/init.c | 13 |
5 files changed, 0 insertions, 45 deletions
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index 7adab180e0ca..8887eb1ffc73 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c | |||
@@ -17,8 +17,6 @@ | |||
17 | #include <linux/bootmem.h> | 17 | #include <linux/bootmem.h> |
18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/clk-provider.h> | ||
21 | #include <linux/of_platform.h> | ||
22 | #include <linux/of_fdt.h> | 20 | #include <linux/of_fdt.h> |
23 | 21 | ||
24 | #include <asm/bootinfo.h> | 22 | #include <asm/bootinfo.h> |
@@ -285,7 +283,6 @@ void __init plat_time_init(void) | |||
285 | 283 | ||
286 | static int __init ath79_setup(void) | 284 | static int __init ath79_setup(void) |
287 | { | 285 | { |
288 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | ||
289 | if (mips_machtype == ATH79_MACH_GENERIC_OF) | 286 | if (mips_machtype == ATH79_MACH_GENERIC_OF) |
290 | return 0; | 287 | return 0; |
291 | 288 | ||
diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c index 510fc0d962f2..0914ef775b5f 100644 --- a/arch/mips/jz4740/setup.c +++ b/arch/mips/jz4740/setup.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/libfdt.h> | 21 | #include <linux/libfdt.h> |
22 | #include <linux/of_fdt.h> | 22 | #include <linux/of_fdt.h> |
23 | #include <linux/of_platform.h> | ||
24 | 23 | ||
25 | #include <asm/bootinfo.h> | 24 | #include <asm/bootinfo.h> |
26 | #include <asm/prom.h> | 25 | #include <asm/prom.h> |
@@ -74,13 +73,6 @@ void __init device_tree_init(void) | |||
74 | unflatten_and_copy_device_tree(); | 73 | unflatten_and_copy_device_tree(); |
75 | } | 74 | } |
76 | 75 | ||
77 | static int __init populate_machine(void) | ||
78 | { | ||
79 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | ||
80 | return 0; | ||
81 | } | ||
82 | arch_initcall(populate_machine); | ||
83 | |||
84 | const char *get_system_type(void) | 76 | const char *get_system_type(void) |
85 | { | 77 | { |
86 | if (config_enabled(CONFIG_MACH_JZ4780)) | 78 | if (config_enabled(CONFIG_MACH_JZ4780)) |
diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c index 9f2f9b2b23ce..edfcaf06680d 100644 --- a/arch/mips/mti-sead3/sead3-setup.c +++ b/arch/mips/mti-sead3/sead3-setup.c | |||
@@ -8,7 +8,6 @@ | |||
8 | */ | 8 | */ |
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/libfdt.h> | 10 | #include <linux/libfdt.h> |
11 | #include <linux/of_platform.h> | ||
12 | #include <linux/of_fdt.h> | 11 | #include <linux/of_fdt.h> |
13 | 12 | ||
14 | #include <asm/prom.h> | 13 | #include <asm/prom.h> |
@@ -107,10 +106,3 @@ void __init device_tree_init(void) | |||
107 | 106 | ||
108 | unflatten_and_copy_device_tree(); | 107 | unflatten_and_copy_device_tree(); |
109 | } | 108 | } |
110 | |||
111 | static int __init customize_machine(void) | ||
112 | { | ||
113 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | ||
114 | return 0; | ||
115 | } | ||
116 | arch_initcall(customize_machine); | ||
diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c index ab79828230ab..c50a670e60d2 100644 --- a/arch/mips/pistachio/init.c +++ b/arch/mips/pistachio/init.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/of_address.h> | 15 | #include <linux/of_address.h> |
16 | #include <linux/of_fdt.h> | 16 | #include <linux/of_fdt.h> |
17 | #include <linux/of_platform.h> | ||
18 | 17 | ||
19 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
20 | #include <asm/dma-coherence.h> | 19 | #include <asm/dma-coherence.h> |
@@ -159,15 +158,3 @@ void __init device_tree_init(void) | |||
159 | 158 | ||
160 | unflatten_and_copy_device_tree(); | 159 | unflatten_and_copy_device_tree(); |
161 | } | 160 | } |
162 | |||
163 | static int __init plat_of_setup(void) | ||
164 | { | ||
165 | if (!of_have_populated_dt()) | ||
166 | panic("Device tree not present"); | ||
167 | |||
168 | if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)) | ||
169 | panic("Failed to populate DT"); | ||
170 | |||
171 | return 0; | ||
172 | } | ||
173 | arch_initcall(plat_of_setup); | ||
diff --git a/arch/mips/xilfpga/init.c b/arch/mips/xilfpga/init.c index ce2aee2169ac..602e384a26a2 100644 --- a/arch/mips/xilfpga/init.c +++ b/arch/mips/xilfpga/init.c | |||
@@ -10,7 +10,6 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/of_fdt.h> | 12 | #include <linux/of_fdt.h> |
13 | #include <linux/of_platform.h> | ||
14 | 13 | ||
15 | #include <asm/prom.h> | 14 | #include <asm/prom.h> |
16 | 15 | ||
@@ -43,15 +42,3 @@ void __init device_tree_init(void) | |||
43 | 42 | ||
44 | unflatten_and_copy_device_tree(); | 43 | unflatten_and_copy_device_tree(); |
45 | } | 44 | } |
46 | |||
47 | static int __init plat_of_setup(void) | ||
48 | { | ||
49 | if (!of_have_populated_dt()) | ||
50 | panic("Device tree not present"); | ||
51 | |||
52 | if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)) | ||
53 | panic("Failed to populate DT"); | ||
54 | |||
55 | return 0; | ||
56 | } | ||
57 | arch_initcall(plat_of_setup); | ||