Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

arm: 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.

Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Lee Jones <lee@kernel.org>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Cc: Roland Stigge <stigge@antcom.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Viresh Kumar <vireshk@kernel.org>
Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 61c78644

arch/arm/kernel/setup.c

+1 −5
Original line number Diff line number Diff line
@@ -904,11 +904,7 @@ static int __init customize_machine(void) 
	 */

	if (machine_desc->init_machine)

		machine_desc->init_machine();

#ifdef CONFIG_OF

	else

		of_platform_populate(NULL, of_default_bus_match_table,

					NULL, NULL);

#endif



	return 0;

}

arch_initcall(customize_machine);

arch/arm/mach-artpec/board-artpec6.c

+0 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/irqchip.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/mfd/syscon.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/clk-provider.h>
@@ -44,8 +43,6 @@ static void __init artpec6_init_machine(void) 
		regmap_write(regmap, ARTPEC6_DMACFG_REGNUM,

			     ARTPEC6_DMACFG_UARTS_BURST);

	};



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static void artpec6_l2c310_write_sec(unsigned long val, unsigned reg)

arch/arm/mach-bcm/board_bcm21664.c

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
 */



#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/io.h>



#include <asm/mach/arch.h>
@@ -60,7 +59,6 @@ static void bcm21664_restart(enum reboot_mode mode, const char *cmd) 


static void __init bcm21664_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	kona_l2_cache_init();

}

arch/arm/mach-bcm/board_bcm281xx.c

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <linux/clocksource.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>



#include <asm/mach/arch.h>
@@ -58,7 +57,6 @@ static void bcm281xx_restart(enum reboot_mode mode, const char *cmd) 


static void __init bcm281xx_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	kona_l2_cache_init();

}

arch/arm/mach-bcm/board_bcm2835.c

+0 −10
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/init.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/clk/bcm2835.h>



#include <asm/mach/arch.h>
@@ -23,16 +22,7 @@ 


static void __init bcm2835_init(void)

{

	int ret;



	bcm2835_init_clocks();



	ret = of_platform_populate(NULL, of_default_bus_match_table, NULL,

				   NULL);

	if (ret) {

		pr_err("of_platform_populate failed: %d\n", ret);

		BUG();

	}

}



static const char * const bcm2835_compat[] = {