Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757284AbcDEF7c (ORCPT ); Tue, 5 Apr 2016 01:59:32 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:54526 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756982AbcDEF7O (ORCPT ); Tue, 5 Apr 2016 01:59:14 -0400 From: Kefeng Wang To: , CC: , , , , , , , , , , Ralf Baechle Subject: [PATCH v3 03/14] mips: use of_platform_default_populate() to populate default bus Date: Tue, 5 Apr 2016 13:59:31 +0800 Message-ID: <1459835982-26473-4-git-send-email-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.6.0.GIT In-Reply-To: <1459835982-26473-1-git-send-email-wangkefeng.wang@huawei.com> References: <1459835982-26473-1-git-send-email-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.570353DC.0074,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b768a2c79464e694bf94a7b67a8cb071 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3440 Lines: 97 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 Cc: Ralf Baechle Signed-off-by: Kefeng Wang --- 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