From patchwork Sat May 27 09:58:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9751731 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 F0A6C602F0 for ; Sat, 27 May 2017 09:59:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9C2827B81 for ; Sat, 27 May 2017 09:59:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCD2E28446; Sat, 27 May 2017 09:59:35 +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 6426027B81 for ; Sat, 27 May 2017 09:59:35 +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: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:In-Reply-To: References:List-Owner; bh=1HqUhaMQrKN9rGrVjcMPT6FlLwqXG0RzHmPF+uOVcq4=; b=C4c Ay4cQI41N9IeEDHVdmYysjImqyzDAOjvSqiTFeRrMD+R3Ok/6PqSkgLx6VfhV0wflXbD7xK/SHduf eRlGLl6o2AmrIKdQ8W7VUoJLkdlEroFCVjH5ZV9nXLelqIZZ0phx7bE/ciNdFC+WCgeOZffMgAzbp XKxZg8W9M+cdLaACuU1nY2PT4/ZgHa5XL5bco9qc+emj8OU9gKYMr1Mk+4op/mi47H5yUkBO7Qppk 1twd9AxWmy6RLOaSSdnjLOzb9YGc1gk9fZ1vM/56Zwvs99HDYoc6RrBbOQR/8WgsYbpfgrZQSJrX1 R+Iu/bLnVgP6cvIrcGqmjlSk1Tdbnlw==; 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 1dEYVR-0001Yg-8j; Sat, 27 May 2017 09:59:33 +0000 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dEYVM-0001X6-IC for linux-arm-kernel@lists.infradead.org; Sat, 27 May 2017 09:59:30 +0000 Received: by mail-wr0-x235.google.com with SMTP id z52so12825267wrc.2 for ; Sat, 27 May 2017 02:59:06 -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; bh=58OPREnU3megszPEpxNDZzPIgA0c8SYWDEgRe5lS12Q=; b=WOaseEyKDWaOstlft1uxET/vDoE/4aWE1qP8dgwesMZoceJwERhpVh71/0OajIl1q6 nzYvNpVELFU+vMyKrUuRlakqsZxLS3RuN+zJMiHmsM31NoTgxndvcSnO6MnDPfLyyL7m kt9R6aNAZpTLaQHIfFeP1xbZFny6MCEO90P7E= 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; bh=58OPREnU3megszPEpxNDZzPIgA0c8SYWDEgRe5lS12Q=; b=fCVfqvyzzB6TrIdB106dqr03mxZ/+bGczho8DfSHsgPJi4WiNHaDHHJrPd3OcRzWTa XyAx9HA5NFSIpBBVA44vrFytxDDzm3U+wZpuDyquPpwmdA8f1pwiFZRSv7Hae3UaiVzs cICgIQRFNpAFD6RhWfZxC8JkJ4icEcXuTR/4DLqBtdQ9XJ7CVtDpai+vhVX8cZx+sLyN 5upBqfmujxP9VW5/tn3nlKrfRCljjomraG5JUJPQM1zv/rjsDA3K6DzlG4Y8oT0A06Oi VrPcN8lluFd8ZD19uoTVNa1lglltQ4Yo26PAdmGXROgs366qHFSJONd0QqoqYFGUCb2z srTg== X-Gm-Message-State: AODbwcBhQT8lrW1KEnMtIWsZ0V8QAyNRYO3pm+jpgzT4qDI9W9wd1fLS Bn8pibDevSuCan4n X-Received: by 10.223.152.18 with SMTP id v18mr1097221wrb.8.1495879145082; Sat, 27 May 2017 02:59:05 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:04 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Subject: [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Date: Sat, 27 May 2017 11:58:42 +0200 Message-Id: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170527_025928_966974_9F687AAF X-CRM114-Status: GOOD ( 15.51 ) 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: Mark Rutland , linux-kernel@vger.kernel.org, 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 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/linux/clockchips.h | 9 ------ 4 files changed, 73 deletions(-) delete mode 100644 drivers/clocksource/clkevt-probe.c 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 8c30fec..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/linux/clockchips.h b/include/linux/clockchips.h index eef1569..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); -#els -static inline int clockevent_probe(void) { return 0; } -#endif - #endif /* _LINUX_CLOCKCHIPS_H */