From patchwork Sat May 27 09:58:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9751757 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 20853602F0 for ; Sat, 27 May 2017 10:00:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F0A227B81 for ; Sat, 27 May 2017 10:00:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13D7C2845C; Sat, 27 May 2017 10:00:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8635727B81 for ; Sat, 27 May 2017 10:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=o2uIoDJAFQO34Xere9K4x6OxVLR/If72Y2mjwl1M/H4=; b=OFSzxLXOYm6eYp2RncJF2kMOeW 4XpWZv34mqnKcEaVq9QXkWLYDm7MC7Tnvmhk16TFqmbNXREVSkFjMwuiyuh/4S+IWEWdpFNCGapgD 88y1Umm9sQForaVUWBHNfjMfFUK10fS/ZGtqKiT9O/iUCdBPc5BZqniC+/AXW5dFwRH9CFrv9CMzX INj4jibJufoKcFLx8PP0ZEiwVwfXSort9BR+awbrybRJ9K0KbzNWDbVmm2REizLw03ACRKELQ7yhs 2+AXXkHoOUJRpwMr3owdTkcVFF1+1v3rc5pLatos+t4z1mLdInQLtyVauVW674DLixV3y2lRRvSXC dCVvb9lA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dEYWN-0003ZE-4x; Sat, 27 May 2017 10:00:31 +0000 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dEYVt-0001gL-6n for linux-arm-kernel@lists.infradead.org; Sat, 27 May 2017 10:00:05 +0000 Received: by mail-wr0-x230.google.com with SMTP id l50so12779128wrc.3 for ; Sat, 27 May 2017 02:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cAokSEZGbSc0SoGx6D6V+qIRX+mHVOcwAnFMaCn+rPc=; b=BhQ7GAKuqLxNbWa2+LCtFo2ogw9glmQDt6Wrbc0KTkxvWOQz2nkgGwdiyBTV6JG4oy wBFexQB0Lxn39Z2gxbWm2Y4Nx1DYDNzwHkFKQvjqnH15ma+1hc8E5bg3vbPtgFYAi/Cs P6xvRp6zfxUNgmHyVJg7gwuqETUAYg8Mo+mX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cAokSEZGbSc0SoGx6D6V+qIRX+mHVOcwAnFMaCn+rPc=; b=kjqST3QS58cgQsa/8Vdb33k3h1sRPYRHXJ2O2plUGs0tsXMmwpouizw5GDHbKLr515 KZp1je6zI0OFTPiNcVsI852rITxInjD2dwaPBRPHeJI58jx0XLa7C9rUSf3nRjAhA1VK 2+lFMXB7IdmTR9h49GDx6E130VRYMci/t5wj9mbjjMIdWwHRxK2DGQnM+DeWJSavmTVQ U9jDdIn21+l7eB4IOgCi+52KXaWLKygHg2VvqnyiN/H/4dMd55zjVFAQ7xlOmy10Kifu NdLYDhlCMQeTx2auMfKqBSsaMrlJhSnNmFjvDYb/cuGk/RyLJJJY2H6Um5vnTMg8WOoM +jLg== X-Gm-Message-State: AODbwcCeM/XNkOY0VI9wP1fkvAxrwTzYAR3p6NMJqcFA4GC4YFaSzSqO UsOE0KLGop3Lq5XM X-Received: by 10.223.151.203 with SMTP id t11mr4959564wrb.18.1495879179060; Sat, 27 May 2017 02:59:39 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:38 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Subject: [PATCH 5/7] clocksource: Rename clksrc Date: Sat, 27 May 2017 11:58:46 +0200 Message-Id: <1495879129-28109-5-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> References: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170527_030001_476909_D464940F X-CRM114-Status: GOOD ( 13.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:GENERIC INCLUDE/ASM HEADER FILES" , Arnd Bergmann , Stephen Boyd , linux-kernel@vger.kernel.org, John Stultz , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The table name is now renamed to 'timer' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano Reviewed-by: Linus Walleij --- drivers/clocksource/clksrc-probe.c | 18 +++++++++--------- include/asm-generic/vmlinux.lds.h | 6 +++--- include/linux/clocksource.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c index 5d549c2..da81e5d 100644 --- a/drivers/clocksource/clksrc-probe.c +++ b/drivers/clocksource/clksrc-probe.c @@ -19,20 +19,20 @@ #include #include -extern struct of_device_id __clksrc_of_table[]; +extern struct of_device_id __timer_of_table[]; -static const struct of_device_id __clksrc_of_table_sentinel - __used __section(__clksrc_of_table_end); +static const struct of_device_id __timer_of_table_sentinel + __used __section(__timer_of_table_end); void __init timer_probe(void) { struct device_node *np; const struct of_device_id *match; of_init_fn_1_ret init_func_ret; - unsigned clocksources = 0; + unsigned timers = 0; int ret; - for_each_matching_node_and_match(np, __clksrc_of_table, &match) { + for_each_matching_node_and_match(np, __timer_of_table, &match) { if (!of_device_is_available(np)) continue; @@ -45,11 +45,11 @@ void __init timer_probe(void) continue; } - clocksources++; + timers++; } - clocksources += acpi_probe_device_table(clksrc); + timers += acpi_probe_device_table(timer); - if (!clocksources) - pr_crit("%s: no matching clocksources found\n", __func__); + if (!timers) + pr_crit("%s: no matching timers found\n", __func__); } diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0968d13..ca922ae 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -172,7 +172,7 @@ KEEP(*(__##name##_of_table)) \ KEEP(*(__##name##_of_table_end)) -#define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) +#define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) @@ -558,14 +558,14 @@ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \ RESERVEDMEM_OF_TABLES() \ - CLKSRC_OF_TABLES() \ + TIMER_OF_TABLES() \ IOMMU_OF_TABLES() \ CPU_METHOD_OF_TABLES() \ CPUIDLE_METHOD_OF_TABLES() \ KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ - ACPI_PROBE_TABLE(clksrc) \ + ACPI_PROBE_TABLE(timer) \ ACPI_PROBE_TABLE(iort) \ EARLYCON_TABLE() diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index e43f37f..7cd38b2 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -250,7 +250,7 @@ extern int clocksource_mmio_init(void __iomem *, const char *, extern int clocksource_i8253_init(void); #define TIMER_OF_DECLARE(name, compat, fn) \ - OF_DECLARE_1_RET(clksrc, name, compat, fn) + OF_DECLARE_1_RET(timer, name, compat, fn) #ifdef CONFIG_CLKSRC_PROBE extern void timer_probe(void); @@ -259,6 +259,6 @@ static inline void timer_probe(void) {} #endif #define TIMER_ACPI_DECLARE(name, table_id, fn) \ - ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn) + ACPI_DECLARE_PROBE_ENTRY(timer, name, table_id, 0, NULL, 0, fn) #endif /* _LINUX_CLOCKSOURCE_H */