aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm
diff options
context:
space:
mode:
authorKefeng Wang <wangkefeng.wang@huawei.com>2016-06-01 02:52:56 -0400
committerRob Herring <robh@kernel.org>2016-06-23 15:58:37 -0400
commit850bea2335e42780a0752a75860d3fbcc3d12d6e (patch)
treeee81a7df0331c86e5dfff8d0c65acf6a59b9f7a4 /arch/arm/mach-bcm
parent61c78644e7f1bd9445b3d7ddc3d35989a38985ee (diff)
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: Viresh 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: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'arch/arm/mach-bcm')
-rw-r--r--arch/arm/mach-bcm/board_bcm21664.c2
-rw-r--r--arch/arm/mach-bcm/board_bcm281xx.c2
-rw-r--r--arch/arm/mach-bcm/board_bcm2835.c10
3 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c
index 82ad5687771f..0d7034c57334 100644
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@ -12,7 +12,6 @@
12 */ 12 */
13 13
14#include <linux/of_address.h> 14#include <linux/of_address.h>
15#include <linux/of_platform.h>
16#include <linux/io.h> 15#include <linux/io.h>
17 16
18#include <asm/mach/arch.h> 17#include <asm/mach/arch.h>
@@ -60,7 +59,6 @@ static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
60 59
61static void __init bcm21664_init(void) 60static void __init bcm21664_init(void)
62{ 61{
63 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
64 kona_l2_cache_init(); 62 kona_l2_cache_init();
65} 63}
66 64
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c
index 2e367bd7c600..b81bb386951d 100644
--- a/arch/arm/mach-bcm/board_bcm281xx.c
+++ b/arch/arm/mach-bcm/board_bcm281xx.c
@@ -13,7 +13,6 @@
13 13
14#include <linux/clocksource.h> 14#include <linux/clocksource.h>
15#include <linux/of_address.h> 15#include <linux/of_address.h>
16#include <linux/of_platform.h>
17 16
18#include <asm/mach/arch.h> 17#include <asm/mach/arch.h>
19 18
@@ -58,7 +57,6 @@ static void bcm281xx_restart(enum reboot_mode mode, const char *cmd)
58 57
59static void __init bcm281xx_init(void) 58static void __init bcm281xx_init(void)
60{ 59{
61 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
62 kona_l2_cache_init(); 60 kona_l2_cache_init();
63} 61}
64 62
diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
index 834d67684e20..0c1edfc98696 100644
--- a/arch/arm/mach-bcm/board_bcm2835.c
+++ b/arch/arm/mach-bcm/board_bcm2835.c
@@ -15,7 +15,6 @@
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/irqchip.h> 16#include <linux/irqchip.h>
17#include <linux/of_address.h> 17#include <linux/of_address.h>
18#include <linux/of_platform.h>
19#include <linux/clk/bcm2835.h> 18#include <linux/clk/bcm2835.h>
20 19
21#include <asm/mach/arch.h> 20#include <asm/mach/arch.h>
@@ -23,16 +22,7 @@
23 22
24static void __init bcm2835_init(void) 23static void __init bcm2835_init(void)
25{ 24{
26 int ret;
27
28 bcm2835_init_clocks(); 25 bcm2835_init_clocks();
29
30 ret = of_platform_populate(NULL, of_default_bus_match_table, NULL,
31 NULL);
32 if (ret) {
33 pr_err("of_platform_populate failed: %d\n", ret);
34 BUG();
35 }
36} 26}
37 27
38static const char * const bcm2835_compat[] = { 28static const char * const bcm2835_compat[] = {