From patchwork Wed Jun 14 12:39:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 105502 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp271918qgd; Wed, 14 Jun 2017 05:42:21 -0700 (PDT) X-Received: by 10.99.3.202 with SMTP id 193mr430992pgd.222.1497444141834; Wed, 14 Jun 2017 05:42:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497444141; cv=none; d=google.com; s=arc-20160816; b=tBTKf1NqISrT0bOissuLcPJC+FiHJrDZnljIIqe/TlhFXVJUaWqwTJUg3YRQV1s6SB G2Y6EJ7JR6f48gStK+KrsOf+oZlNgAqBHHUGZJu2sPv3kOxie/a3b+DaBPqumV49aguj vwVF+USJeQFK1KFQeY1IDRiQhFQ5CaSi7J5WLAbGFUhb7nnE+mk6y2Uk57bf8ot+U/s9 imS4U+4Lm0aVat3pBRsnPVMy3wT/5VgeMnVFSnCWqrFDx7v4Fr6g0dB7Yqs+oNGJV8JO qqoxm4P0W857clft3DJXSp9p2zyekHnoTsGn56nNr4dIJ0d89iJKZEAzjLwqkQmM8Xh1 mTtw== 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=CTBj6VugFqP/r+4YmbJX4NBIGU5AR1cVccm3RV9PHp0=; b=s0w+sNlSlC1mHG0mnOi75c/YzUfNnD2bwlJwTOglmKqawO2vVGiXU0kH3B5b4vU6kL hG4gGz9SmWzppJ+Qls/rBv5aYm//1IdC4Af5sJgh3gRk3elZ5dxjP1i4NyB/EtL+Rd9A rmeBXTyyM5LCrUv8q2MO8OWzTazzmhlZGUXVQvPnVIlQPIyFP3ore7Y6naJhEqk1oKDS dxaaqTGiQEwA7kVDTXjAgJsH5K4wdTjg/e4AprivBn8rIaC4M0I27lojUpnzl3fzduQ8 NCJzZwNT1HOzDVBKZ+oaEZtMLloDjzmyZXNNyM7quTBzGe89vG0Qz0vHM7/sExCd3OYe TUdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=hMSCd2rS; 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 r6si629373plj.223.2017.06.14.05.42.21; Wed, 14 Jun 2017 05:42:21 -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 header.b=hMSCd2rS; 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 S1752651AbdFNMmD (ORCPT + 25 others); Wed, 14 Jun 2017 08:42:03 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:35966 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752127AbdFNMmA (ORCPT ); Wed, 14 Jun 2017 08:42:00 -0400 Received: by mail-wr0-f172.google.com with SMTP id 36so66305499wry.3 for ; Wed, 14 Jun 2017 05:41:59 -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=CTBj6VugFqP/r+4YmbJX4NBIGU5AR1cVccm3RV9PHp0=; b=hMSCd2rSXnijiz8h5L+hnWY4JE4K8JCt2yk1UGMGYxqSkY8meoV/gT7o/cnTkpj5Ds w/vS3rwNgyjvPQcIYH/UiB7cc552C/26XSI16wFAkYg1EgtMcoIPG7uEikm5WI/TF+CD 5X/4+8lgAdkSS8+y3y2IpShR9HFr9IXjwrrK8= 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=CTBj6VugFqP/r+4YmbJX4NBIGU5AR1cVccm3RV9PHp0=; b=EJcv7EHFjy3L+2Rkq9S8UBtYmJNfWmC3f8sFK+q8svtkrB99xvmQUzKMCOFtyCoz58 jS9MPUjqAvvvnVcr4h/IBPO5HiJwjosZrHkiiYAr1bn9L6EfTB0clH3trgnbpYqIsN6M TAVgcWHx0ghQPbKE8wZHAvOO/p8r4KPwrv2DcoGH37+iOAshD24p8xjQ2nTy7pEhMBOR K6tnm5SEyLyArlSMTXjjashHL022ly5KvFGD+Py2NTmGPUPeFREBBr2Ra/3awK21rjBc NDJHBxVfdfLnzL6O6EqEDAS8etLY3BahqD/tbzn8fBhUHtc0PnQJvveBYnRmhLpFgqWk mnAw== X-Gm-Message-State: AKS2vOzgRIhHXpSdjZ9GFhM3pHr0srmCPGFUt5aaJwBHHhe1uYM1mGqs hIDlO4g1WuIKE4Yd X-Received: by 10.223.145.78 with SMTP id j72mr375254wrj.7.1497444118974; Wed, 14 Jun 2017 05:41:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:19a:b336:54d7:46e9]) by smtp.gmail.com with ESMTPSA id 80sm1457015wmg.17.2017.06.14.05.41.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 05:41:58 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , John Stultz , Stephen Boyd , linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/A...) Subject: [PATCH 15/23] clocksource/drivers: Rename clksrc table to timer Date: Wed, 14 Jun 2017 14:39:36 +0200 Message-Id: <1497443984-12371-15-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497443984-12371-1-git-send-email-daniel.lezcano@linaro.org> References: <20170614123800.GH2261@mai> <1497443984-12371-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 Reviewed-by: Linus Walleij --- drivers/clocksource/clksrc-probe.c | 18 +++++++++--------- include/asm-generic/vmlinux.lds.h | 7 ++++--- include/linux/clocksource.h | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) -- 2.7.4 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 401d324..c6a4ef50 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) @@ -556,14 +556,15 @@ 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() #define INIT_TEXT \ 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 */