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>

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 7adab180e0ca61e32f6e4e811d09f041ddd1a4ee..8887eb1ffc738f0784917bed98cc0d03df175929 100644 (file)
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -17,8 +17,6 @@
 #include <linux/bootmem.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/clk-provider.h>
-#include <linux/of_platform.h>
 #include <linux/of_fdt.h>
 
 #include <asm/bootinfo.h>
@@ -285,7 +283,6 @@ void __init plat_time_init(void)
 
 static int __init ath79_setup(void)
 {
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
        if  (mips_machtype == ATH79_MACH_GENERIC_OF)
                return 0;
 

diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 510fc0d962f215e90396d687328ac302ebaf8d66..0914ef775b5f9579b855bb398aea5f3155d8c336 100644 (file)
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 
 #include <asm/bootinfo.h>
 #include <asm/prom.h>
@@ -74,13 +73,6 @@ void __init device_tree_init(void)
        unflatten_and_copy_device_tree();
 }
 
-static int __init populate_machine(void)
-{
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-       return 0;
-}
-arch_initcall(populate_machine);
-
 const char *get_system_type(void)
 {
        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 9f2f9b2b23cedd5464b3a491128ef8b36424ea48..edfcaf06680d37c917bdf9f3d58a5ec042943a76 100644 (file)
--- a/arch/mips/mti-sead3/sead3-setup.c
+++ b/arch/mips/mti-sead3/sead3-setup.c
@@ -8,7 +8,6 @@
  */
 #include <linux/init.h>
 #include <linux/libfdt.h>
-#include <linux/of_platform.h>
 #include <linux/of_fdt.h>
 
 #include <asm/prom.h>
@@ -107,10 +106,3 @@ void __init device_tree_init(void)
 
        unflatten_and_copy_device_tree();
 }
-
-static int __init customize_machine(void)
-{
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-       return 0;
-}
-arch_initcall(customize_machine);

diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
index ab79828230ab3e53fc0e2b25e6d33d81eacd9f91..c50a670e60d2037e1e206ac58c81683304442223 100644 (file)
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 
 #include <asm/cacheflush.h>
 #include <asm/dma-coherence.h>
@@ -159,15 +158,3 @@ void __init device_tree_init(void)
 
        unflatten_and_copy_device_tree();
 }
-
-static int __init plat_of_setup(void)
-{
-       if (!of_have_populated_dt())
-               panic("Device tree not present");
-
-       if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
-               panic("Failed to populate DT");
-
-       return 0;
-}
-arch_initcall(plat_of_setup);

diff --git a/arch/mips/xilfpga/init.c b/arch/mips/xilfpga/init.c
index ce2aee2169ac958dac717c14ff3e3eada8f396b4..602e384a26a246bc4ab16a99393e0e199e7d7c89 100644 (file)
--- a/arch/mips/xilfpga/init.c
+++ b/arch/mips/xilfpga/init.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 
 #include <asm/prom.h>
 
@@ -43,15 +42,3 @@ void __init device_tree_init(void)
 
        unflatten_and_copy_device_tree();
 }
-
-static int __init plat_of_setup(void)
-{
-       if (!of_have_populated_dt())
-               panic("Device tree not present");
-
-       if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
-               panic("Failed to populate DT");
-
-       return 0;
-}
-arch_initcall(plat_of_setup);