Commit ddd0ce87 authored by Kefeng Wang's avatar Kefeng Wang Committed by Rob Herring
Browse files

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: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 17033917

arch/mips/ath79/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

arch/mips/jz4740/setup.c

+0 −8
Original line number Diff line number Diff line
@@ -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))

arch/mips/mti-sead3/sead3-setup.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

arch/mips/pistachio/init.c

+0 −13
Original line number Diff line number Diff line
@@ -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);

arch/mips/xilfpga/init.c

+0 −13
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE