linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>
Cc: <arnd@arndb.de>, <shawnguo@kernel.org>, <catalin.marinas@arm.com>,
	<linux@arm.linux.org.uk>, <robh+dt@kernel.org>,
	<grant.likely@linaro.org>, <olof@lixom.net>,
	<yamada.masahiro@socionext.com>, <wangkefeng.wang@huawei.com>,
	<guohanjun@huawei.com>, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH v2 all 03/14] mips: use of_platform_default_populate() to populate default bus
Date: Wed, 16 Mar 2016 15:35:32 +0800	[thread overview]
Message-ID: <1458113743-15131-4-git-send-email-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <1458113743-15131-1-git-send-email-wangkefeng.wang@huawei.com>

Use helper of_platform_default_populate() in linux/of_platform
when possible, instead of calling of_platform_populate() with
the default match table.

Tested-by: Joshua Henderson <joshua.henderson@microchip.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 arch/mips/ath79/setup.c           | 2 +-
 arch/mips/jz4740/setup.c          | 2 +-
 arch/mips/mti-sead3/sead3-setup.c | 2 +-
 arch/mips/pic32/pic32mzda/init.c  | 3 +--
 arch/mips/pistachio/init.c        | 2 +-
 arch/mips/xilfpga/init.c          | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index be451ee4a..51deb50 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -248,7 +248,7 @@ void __init plat_time_init(void)
 
 static int __init ath79_setup(void)
 {
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	of_platform_default_populate(NULL, 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..d175c74 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -76,7 +76,7 @@ void __init device_tree_init(void)
 
 static int __init populate_machine(void)
 {
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	of_platform_default_populate(NULL, NULL, NULL);
 	return 0;
 }
 arch_initcall(populate_machine);
diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c
index e43f480..bc73f32 100644
--- a/arch/mips/mti-sead3/sead3-setup.c
+++ b/arch/mips/mti-sead3/sead3-setup.c
@@ -105,7 +105,7 @@ void __init device_tree_init(void)
 
 static int __init customize_machine(void)
 {
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	of_platform_default_populate(NULL, NULL, NULL);
 	return 0;
 }
 arch_initcall(customize_machine);
diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c
index 775ff90..77ecf32 100644
--- a/arch/mips/pic32/pic32mzda/init.c
+++ b/arch/mips/pic32/pic32mzda/init.c
@@ -147,8 +147,7 @@ static int __init plat_of_setup(void)
 		panic("Device tree not present");
 
 	pic32_of_prepare_platform_data(pic32_auxdata_lookup);
-	if (of_platform_populate(NULL, of_default_bus_match_table,
-				 pic32_auxdata_lookup, NULL))
+	if (of_platform_default_populate(NULL, pic32_auxdata_lookup, NULL))
 		panic("Failed to populate DT");
 
 	return 0;
diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
index 96ba2cc..0bc25e3 100644
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -128,7 +128,7 @@ 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))
+	if (of_platform_default_populate(NULL, NULL, NULL))
 		panic("Failed to populate DT");
 
 	return 0;
diff --git a/arch/mips/xilfpga/init.c b/arch/mips/xilfpga/init.c
index ce2aee2..a97382f 100644
--- a/arch/mips/xilfpga/init.c
+++ b/arch/mips/xilfpga/init.c
@@ -49,7 +49,7 @@ 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))
+	if (of_platform_default_populate(NULL, NULL, NULL))
 		panic("Failed to populate DT");
 
 	return 0;
-- 
2.6.0.GIT

  parent reply	other threads:[~2016-03-16  7:36 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16  7:35 [PATCH v2 all 00/14] use of_platform_default_populate() to populate default bus Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 01/14] arm: " Kefeng Wang
2016-03-17  6:19   ` Viresh Kumar
2016-03-16  7:35 ` [PATCH v2 all 02/14] arm64: " Kefeng Wang
2016-03-16  7:35 ` Kefeng Wang [this message]
2016-03-16  7:35 ` [PATCH v2 all 04/14] arc: " Kefeng Wang
2016-03-17 11:29   ` Vineet Gupta
2016-03-17 13:28     ` Rob Herring
2016-03-17 14:19       ` Vineet Gupta
2016-03-17 14:40         ` Rob Herring
2016-03-16  7:35 ` [PATCH v2 all 05/14] c6x: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 06/14] metag: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 07/14] cris: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 08/14] nios2: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 09/14] xtensa: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 10/14] bus: imx-weim: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 11/14] bus: uniphier-system-bus: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 12/14] memory: omap-gpmc: " Kefeng Wang
2016-03-16 10:38   ` Roger Quadros
2016-03-16  7:35 ` [PATCH v2 all 13/14] of: unittest: " Kefeng Wang
2016-03-16  7:35 ` [PATCH v2 all 14/14] Revert "of/platform: export of_default_bus_match_table" Kefeng Wang
2016-04-19 21:10 ` [PATCH v2 all 00/14] use of_platform_default_populate() to populate default bus Rob Herring
2016-04-21  7:55   ` Kefeng Wang
2016-04-21 13:10     ` Rob Herring
2016-04-22  2:47       ` Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458113743-15131-4-git-send-email-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=grant.likely@linaro.org \
    --cc=guohanjun@huawei.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=olof@lixom.net \
    --cc=ralf@linux-mips.org \
    --cc=robh+dt@kernel.org \
    --cc=shawnguo@kernel.org \
    --cc=yamada.masahiro@socionext.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).