From patchwork Thu May 12 12:06:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 67641 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp714244qge; Thu, 12 May 2016 05:02:17 -0700 (PDT) X-Received: by 10.67.14.7 with SMTP id fc7mr13187841pad.1.1463054537223; Thu, 12 May 2016 05:02:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pg8si17392345pab.40.2016.05.12.05.02.16; Thu, 12 May 2016 05:02:17 -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 S1753139AbcELMCP (ORCPT + 29 others); Thu, 12 May 2016 08:02:15 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:53606 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752393AbcELMCO (ORCPT ); Thu, 12 May 2016 08:02:14 -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 DHA62049; Thu, 12 May 2016 20:00:58 +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:37 +0800 From: Kefeng Wang To: , , CC: , , , , , , , , Kefeng Wang , Chris Zankel , Max Filippov Subject: [PATCH v4 11/18] xtensa: Remove unnecessary of_platform_populate with default match table Date: Thu, 12 May 2016 20:06:08 +0800 Message-ID: <1463054775-18170-12-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.5734707B.0386, 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: ea1a544510e001db21fa81f5b595beb9 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. Move of_clk_init() into time_init(), then drop xtensa_device_probe() fully. Cc: Chris Zankel Cc: Max Filippov Signed-off-by: Kefeng Wang --- arch/xtensa/kernel/setup.c | 11 ----------- arch/xtensa/kernel/time.c | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) -- 1.7.12.4 diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 9735691..18af563 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -22,10 +22,8 @@ #include #include #include -#include #include #include -#include #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) # include @@ -252,15 +250,6 @@ void __init early_init_devtree(void *params) strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); } -static int __init xtensa_device_probe(void) -{ - of_clk_init(NULL); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); - return 0; -} - -device_initcall(xtensa_device_probe); - #endif /* CONFIG_OF */ /* diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index b9ad9fe..6ec73c9 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -148,6 +149,7 @@ void __init time_init(void) local_timer_setup(0); setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction); sched_clock_register(ccount_sched_clock_read, 32, ccount_freq); + of_clk_init(NULL); clocksource_probe(); }