From patchwork Thu May 12 12:06:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 67645 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp714610qge; Thu, 12 May 2016 05:02:55 -0700 (PDT) X-Received: by 10.67.13.78 with SMTP id ew14mr12843151pad.127.1463054575406; Thu, 12 May 2016 05:02:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u90si17051918pfa.250.2016.05.12.05.02.55; Thu, 12 May 2016 05:02:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932359AbcELMCh (ORCPT + 29 others); Thu, 12 May 2016 08:02:37 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:53869 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932188AbcELMCe (ORCPT ); Thu, 12 May 2016 08:02:34 -0400 Received: from 172.24.1.36 (EHLO szxeml426-hub.china.huawei.com) ([172.24.1.36]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DHA62055; Thu, 12 May 2016 20:01:01 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml426-hub.china.huawei.com (10.82.67.181) with Microsoft SMTP Server id 14.3.235.1; Thu, 12 May 2016 20:00:34 +0800 From: Kefeng Wang To: , , CC: , , , , , , , , Kefeng Wang , Ralf Baechle , Alban Bedel , Paul Burton , James Hogan , Joshua Henderson , Zubair Lutfullah Kakakhel Subject: [PATCH v4 08/18] mips: Remove unnecessary of_platform_populate with default match table Date: Thu, 12 May 2016 20:06:05 +0800 Message-ID: <1463054775-18170-9-git-send-email-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.6.0.GIT In-Reply-To: <1463054775-18170-1-git-send-email-wangkefeng.wang@huawei.com> References: <1463054775-18170-1-git-send-email-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.5734707F.0338, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 01c60dbd3f91c63999c6913511d5082b Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After patch "of/platform: Add common method to populate default bus", it is possible for arch code to remove unnecessary callers about the of_platform_populate with default match table. Cc: Ralf Baechle Cc: Alban Bedel Cc: Paul Burton Cc: James Hogan Cc: Joshua Henderson Cc: Zubair Lutfullah Kakakhel Signed-off-by: Kefeng Wang --- arch/mips/ath79/setup.c | 2 -- arch/mips/jz4740/setup.c | 8 -------- arch/mips/mti-sead3/sead3-setup.c | 8 -------- arch/mips/pistachio/init.c | 13 ------------- arch/mips/xilfpga/init.c | 13 ------------- 5 files changed, 44 deletions(-) -- 1.7.12.4 diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index be451ee4a..c221506 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -248,7 +247,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; diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c index 510fc0d..0914ef7 100644 --- a/arch/mips/jz4740/setup.c +++ b/arch/mips/jz4740/setup.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -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)) diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c index e43f480..9f85854 100644 --- a/arch/mips/mti-sead3/sead3-setup.c +++ b/arch/mips/mti-sead3/sead3-setup.c @@ -8,7 +8,6 @@ */ #include #include -#include #include #include @@ -102,10 +101,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); diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c index 96ba2cc..8b730fe 100644 --- a/arch/mips/pistachio/init.c +++ b/arch/mips/pistachio/init.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -122,15 +121,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); diff --git a/arch/mips/xilfpga/init.c b/arch/mips/xilfpga/init.c index ce2aee2..602e384 100644 --- a/arch/mips/xilfpga/init.c +++ b/arch/mips/xilfpga/init.c @@ -10,7 +10,6 @@ */ #include -#include #include @@ -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);