[PATCH v5 08/18] mips: Remove unnecessary of_platform_populate with default match table

[Kefeng Wang]

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 
Cc: Alban Bedel 
Cc: Paul Burton 
Cc: James Hogan 
Cc: Joshua Henderson 
Cc: Zubair Lutfullah Kakakhel 
Signed-off-by: Kefeng Wang 
---
 arch/mips/ath79/setup.c   |  3 ---
 arch/mips/jz4740/setup.c  |  8 
 arch/mips/mti-sead3/sead3-setup.c |  8 
 arch/mips/pistachio/init.c| 13 -
 arch/mips/xilfpga/init.c  | 13 -
 5 files changed, 45 deletions(-)

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 7adab18..8887eb1 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -17,8 +17,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 #include 
@@ -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 510fc0d..0914ef7 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -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 9f2f9b2..edfcaf0 100644
--- a/arch/mips/mti-sead3/sead3-setup.c
+++ b/arch/mips/mti-sead3/sead3-setup.c
@@ -8,7 +8,6 @@
  */
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -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 ab79828..c50a670 100644
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -14,7 +14,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -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 ce2aee2..602e384 100644
--- a/arch/mips/xilfpga/init.c
+++ b/arch/mips/xilfpga/init.c
@@ -10,7 +10,6 @@
  */
 
 #include 
-#include 
 
 #include 
 
@@ -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);
-- 
1.7.12.4

[PATCH v5 08/18] mips: Remove unnecessary of_platform_populate with default match table

[Kefeng Wang]

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 
Cc: Alban Bedel 
Cc: Paul Burton 
Cc: James Hogan 
Cc: Joshua Henderson 
Cc: Zubair Lutfullah Kakakhel 
Signed-off-by: Kefeng Wang 
---
 arch/mips/ath79/setup.c   |  3 ---
 arch/mips/jz4740/setup.c  |  8 
 arch/mips/mti-sead3/sead3-setup.c |  8 
 arch/mips/pistachio/init.c| 13 -
 arch/mips/xilfpga/init.c  | 13 -
 5 files changed, 45 deletions(-)

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 7adab18..8887eb1 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -17,8 +17,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 #include 
@@ -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 510fc0d..0914ef7 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -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 9f2f9b2..edfcaf0 100644
--- a/arch/mips/mti-sead3/sead3-setup.c
+++ b/arch/mips/mti-sead3/sead3-setup.c
@@ -8,7 +8,6 @@
  */
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -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 ab79828..c50a670 100644
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -14,7 +14,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -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 ce2aee2..602e384 100644
--- a/arch/mips/xilfpga/init.c
+++ b/arch/mips/xilfpga/init.c
@@ -10,7 +10,6 @@
  */
 
 #include 
-#include 
 
 #include 
 
@@ -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);
-- 
1.7.12.4