From patchwork Wed Jun 14 12:39:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 105500 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp271610qgd; Wed, 14 Jun 2017 05:41:36 -0700 (PDT) X-Received: by 10.99.152.70 with SMTP id l6mr436728pgo.136.1497444096354; Wed, 14 Jun 2017 05:41:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497444096; cv=none; d=google.com; s=arc-20160816; b=G7q+i7RuOgjI31uLD0TcWPqY04vAJBPGk5h7vvoNtbOVYrgPuDBTU4B8Dl29eWr2dX w2jBbKZnLzkQ1zViOtLnUPAlR0eoBB+PrUAYvw/zbgrrWT/FN1Nqo8G51TKbN0qo0Q3k 1KRxM4H1DBo+jHkOflQU25U/yj7LqKeJwVcz9ap/wnYC7pP6saZCdYQB/ccbi6r8kxJE X7wONNwQ2i3OrN2mt+1HTIBRkFcRhYWLM4X90jw/T+DitQ7uTpgsvxHTdbWlxeit4It4 Rwbl8jMMqteZBeEdssspbaUPmQohbsHo5ghut9EiQJzlCMz8JNF/fPMoxZUmqKA+kksX Pcrg== 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=IYYe+4T7iSNenj0XXrLlcpDihhgG1Sfu5EPTqBGTbAQ=; b=A94LwUkDltQ9uxv6CKOxj/g12AwvXiNa6Oem3TWVXKvjtjT5XdeOzA9wGZoRwzRg14 VQVJyxhZmPqIzwR1PXm05Ijj+Pf0akCUqKxllRHEWeq9Em7x7HxYsosHrb2A6vt/pN7W PRQNPVZTza4y0eKRN58C758pWuMlw11cBEdF1BspPjtyuzeflP3n4SPB7ZTFYKInlEK7 Yu+j6tuP6UnT6UxplczGOoSbjBJNfjggjLfMEOW7OLKjgfLU9ZhxLn++T/K6/c7cD/u9 BjwbsmL/nhGqsLtmFKtLxWtfq0Hm+CajMU/EDa2S9+QCtaq3yZsQCkHizQ5o9Lx9tnC8 vzfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=hJlFCTvF; 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 g71si422022pgc.295.2017.06.14.05.41.36; Wed, 14 Jun 2017 05:41:36 -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=hJlFCTvF; 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 S1752599AbdFNMl2 (ORCPT + 25 others); Wed, 14 Jun 2017 08:41:28 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:34744 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbdFNMlZ (ORCPT ); Wed, 14 Jun 2017 08:41:25 -0400 Received: by mail-wr0-f173.google.com with SMTP id 77so40860119wrb.1 for ; Wed, 14 Jun 2017 05:41:19 -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=IYYe+4T7iSNenj0XXrLlcpDihhgG1Sfu5EPTqBGTbAQ=; b=hJlFCTvF4igAbpQLIDnAbe3Ts3I6HDu+8SZAZvdYD7BHMKebuqC9NsFyDYa50/RSAL ivNM5JHm457U1hlgpnqCLnkt7oxHvtmG14Cc1LaoQhxCzwu6nyj1EdPqMPOY1TdRIb+v NHRyzALzIkKb/aBjwE4a9AdKZCqkJ0rhB/FWU= 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=IYYe+4T7iSNenj0XXrLlcpDihhgG1Sfu5EPTqBGTbAQ=; b=OoaLfbmMiV1UwqshOfnDDIz5fg21bgQJJRJxPjuAvJPAOCPcjLRBiKkCH3o7Bb5UsH JEidDOp3SjQShqA+5Bm8O8JUi2/7IyKJmINwhR3jbP7prs+P4frSjnDhNph+HvmAc7z3 TICjNobou/OLQ00HYX6bZkjez4FMbwQgSib/9CwSsJlJqnT/5Zu3rW+UmEs5rzW1PuVN f8475Ko3Z4FzdxtBOpugv6XZWD78/4xrB5D+Hk65KlYKVjh5NpVUCk7FB8M4OqFfbXIA CCBt1QaF8phCqW3ZhNaNl1b5C2fmNM1rwy7ymwMwfX6pbKv48A10DcYutHX23WvuksDy 2S4Q== X-Gm-Message-State: AKS2vOyoyQhIwrGEa9Pnnf+7nd/iUj73l3cTVOzO2Uf+25h7FhCBBeYj IM8GG6rnlCcmjG7t X-Received: by 10.223.162.215 with SMTP id t23mr341726wra.193.1497444078383; Wed, 14 Jun 2017 05:41:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 05:41:17 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Mark Rutland , Arnd Bergmann , linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/A...) Subject: [PATCH 11/23] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Date: Wed, 14 Jun 2017 14:39:32 +0200 Message-Id: <1497443984-12371-11-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 After discussing it, this feature is dropped as it is not considered adequate: https://patchwork.kernel.org/patch/9639317/ There is no user of this macro yet, so there is no impact on the drivers. This reverts commit 376bc27150f180d9f5eddec6a14117780177589d. Cc: Mark Rutland Signed-off-by: Daniel Lezcano --- drivers/clocksource/Kconfig | 7 ----- drivers/clocksource/Makefile | 1 - drivers/clocksource/clkevt-probe.c | 56 -------------------------------------- include/asm-generic/vmlinux.lds.h | 2 -- include/linux/clockchips.h | 9 ------ 5 files changed, 75 deletions(-) delete mode 100644 drivers/clocksource/clkevt-probe.c -- 2.7.4 diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 1b22ade..623fcc6 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -5,10 +5,6 @@ config CLKSRC_OF bool select CLKSRC_PROBE -config CLKEVT_OF - bool - select CLKEVT_PROBE - config CLKSRC_ACPI bool select CLKSRC_PROBE @@ -16,9 +12,6 @@ config CLKSRC_ACPI config CLKSRC_PROBE bool -config CLKEVT_PROBE - bool - config CLKSRC_I8253 bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index cf0c30b..cad713c 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,5 +1,4 @@ obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o -obj-$(CONFIG_CLKEVT_PROBE) += clkevt-probe.o obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c deleted file mode 100644 index eb89b50..0000000 --- a/drivers/clocksource/clkevt-probe.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2016, Linaro Ltd. All rights reserved. - * Daniel Lezcano - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -extern struct of_device_id __clkevt_of_table[]; - -static const struct of_device_id __clkevt_of_table_sentinel - __used __section(__clkevt_of_table_end); - -int __init clockevent_probe(void) -{ - struct device_node *np; - const struct of_device_id *match; - of_init_fn_1_ret init_func; - int ret, clockevents = 0; - - for_each_matching_node_and_match(np, __clkevt_of_table, &match) { - if (!of_device_is_available(np)) - continue; - - init_func = match->data; - - ret = init_func(np); - if (ret) { - pr_warn("Failed to initialize '%s' (%d)\n", - np->name, ret); - continue; - } - - clockevents++; - } - - if (!clockevents) { - pr_crit("%s: no matching clockevent found\n", __func__); - return -ENODEV; - } - - return 0; -} diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 314a0b9..401d324 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -173,7 +173,6 @@ KEEP(*(__##name##_of_table_end)) #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) -#define CLKEVT_OF_TABLES() OF_TABLE(CONFIG_CLKEVT_OF, clkevt) #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,7 +557,6 @@ CLK_OF_TABLES() \ RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ - CLKEVT_OF_TABLES() \ IOMMU_OF_TABLES() \ CPU_METHOD_OF_TABLES() \ CPUIDLE_METHOD_OF_TABLES() \ diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index acc9ce0..a116926 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -223,13 +223,4 @@ static inline void tick_setup_hrtimer_broadcast(void) { } #endif /* !CONFIG_GENERIC_CLOCKEVENTS */ -#define CLOCKEVENT_OF_DECLARE(name, compat, fn) \ - OF_DECLARE_1_RET(clkevt, name, compat, fn) - -#ifdef CONFIG_CLKEVT_PROBE -extern int clockevent_probe(void); -#else -static inline int clockevent_probe(void) { return 0; } -#endif - #endif /* _LINUX_CLOCKCHIPS_H */