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: 100600 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622364qge; Sat, 27 May 2017 03:00:31 -0700 (PDT) X-Received: by 10.98.204.130 with SMTP id j2mr7217094pfk.107.1495879231325; Sat, 27 May 2017 03:00:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879231; cv=none; d=google.com; s=arc-20160816; b=hV6JxVA8wEttQC6tki3EdVTynn2/muiJU9/iIhm+Iacbl/rqxq1mhPdNpCbgqEEjoa bKiaGxQDRBb7VaFlshm9aq4ZGNeFnBJQoVS+pBkIZrdS12VgaPaT5pUJhXp2T46huQCz alzinceXoYhOvzwMw7bsikUF9ury2zqAMhese8iQWAIbu38x+znif3PwvZu7WoNKWpfN H0mr2GI/XzWjzCbker1ed2vpIRFyYRrckad/BXB1Cr1g4xE4K+kb4sAw+DNhakFYPkzL HVIlA30w4plZNTzj/ENEqsUUq7Vbf88UYktdsai1aFzQGmj0f4RoOOLwqcRa7pEqI6uM 56IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=cAokSEZGbSc0SoGx6D6V+qIRX+mHVOcwAnFMaCn+rPc=; b=fUv1m26v2T31z8DN+nGD33twlJgRWiwAvD74MdfEq14aYX0+TKnCmHMgQDV2gDmgti cuMbOzZpYjjsxnjiV2BjH+PXY08HslHEC+26biG7xp2p23YyPEfhluHUZEf1glJnDcnV djg+LEpJkqYW00mbuBCCpYWm9+Id9KgAFKzzPD7FAbKS7Q4rLML2zcooztaDKKylX4lU l1Un32rQJrpbI4Wyi2fCAHbezm1RU5NHJcziaiKnwnWi/gHZK6GyBoIfme/JNPXMVwiQ mLxBt70VYtMk3I0FIX+gTTHXJgYazXHWbz+MtKfslYfpdSjxK7kcK1mRrSkJi7X0cj6G /Fyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z31si5578593plb.186.2017.05.27.03.00.31; Sat, 27 May 2017 03:00:31 -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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364AbdE0KAW (ORCPT + 25 others); Sat, 27 May 2017 06:00:22 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:32959 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755134AbdE0J7k (ORCPT ); Sat, 27 May 2017 05:59:40 -0400 Received: by mail-wr0-f177.google.com with SMTP id w50so12794530wrc.0 for ; Sat, 27 May 2017 02:59:39 -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=at8CCHFi/vcqqXLWcWJM9iahp3vCe0u3O9uYS1ODZ3XBrwhMzdW9iwLHt58yhSQUnk oA8W96PH7JbOyN1JpscwVOYz4tYISOerkXrfKKZgJKDJ3/mnf7aFAw/trvlW3zTcvfpl UB9FO44Vn1IdXGeKXlrCwclSBehDhIX3/xrfP7WhyubixiuqZ4sbxD0j3OtyjWS8iunJ kZDYmvwZbYXFvzW3Ws9GbyfenBS+gbSbTu8o1udciHfhGa3W0EBatUKaYUGw2/kyGj29 HD1ngYR5jB51ycumN8aXiLBlOQWb9DXS3zJdT94GDpPZqyqU3c0XVFsSwAQa2n3SSO0y NKMQ== X-Gm-Message-State: AODbwcApXBtAyb3lJUh/JtlxDcJaT6MEpGe0T1Sbfd0YZqUR5pBhu6vk eAYSeE7pQc3apCmWXeDv0baF 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , John Stultz , Stephen Boyd , linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The table name is now renamed to 'timer' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano --- 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(-) -- 2.7.4 Reviewed-by: Linus Walleij 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 */