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: 100596 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622046qge; Sat, 27 May 2017 02:59:33 -0700 (PDT) X-Received: by 10.84.178.129 with SMTP id z1mr17608643plb.171.1495879173253; Sat, 27 May 2017 02:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879173; cv=none; d=google.com; s=arc-20160816; b=r/J0D0rZ2he4wbsf5bF11Rj++UMTqodEgEGoHa+5OKC/Mauptv6OUE03zPHDg4apdN iLkPQNxaHwTFXh5AcF/R6GnOoumfDLb+aI9vOFWD2dOxSfdZV0puhrgS6VxfejcKwl3Q 1imsYpZLpwBLwt22V2Be1q+bZBOa3QyJ/pK3f/1cK+cyyjg2uqHPxCBw2Lwlhm1VIsk7 bmKCR2ACG3Pm3zsnVtZbPBrFmcTl9TdKLz0omCptKhvNdD1q9m92Qs/x1QPEKweg3SPb D6fWhi0YBkvQaapR5VVEl287IaDka+p3nH67J2d8lSUf+rxL0aVlTSrcmQNlgXrMMKTX lEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=58OPREnU3megszPEpxNDZzPIgA0c8SYWDEgRe5lS12Q=; b=xjG/ui+tURrpwADdqUC/BRKTI94j/nXFls0pOAhH728cENC8F/9aFiBh0c5Dkcy2Tt 5M9SID7OYrvXI0Rg/RM+IrXHSsjrmziXGcdRI9DNo3kPj+goLMMF/diI9oPwPUyOAgam mRh5RGR/E+1awz5TrxQ83TqZkwvfd9U7uWM9qgrezt7NW866oKeLuX7xa4mUyU1daqdo nYriMGE0TAUtoOIf3vuQHZ9JsQkSfw5PpG/Ne+wu1zPTkLhxIuOMvBHmbfUgVwRz5XkI G71syscvZA+Ig6ZfP2X/rmjz7BSQLbIBJCN2PVYQWyQeClRP5qfe/vIlHrqeU+MJdCrC 8w/w== 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 n6si3804937pfb.286.2017.05.27.02.59.32; Sat, 27 May 2017 02:59:33 -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 S1755245AbdE0J7I (ORCPT + 25 others); Sat, 27 May 2017 05:59:08 -0400 Received: from mail-wr0-f175.google.com ([209.85.128.175]:34324 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755221AbdE0J7G (ORCPT ); Sat, 27 May 2017 05:59:06 -0400 Received: by mail-wr0-f175.google.com with SMTP id j27so12805960wre.1 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=jOceruAmsWWsi+6dmZgd6TbwKD9sVUIKZZnMkrEe5sdfR6mRiLSi+Vb4av/+k2Zo1X pCuwGjYoxMbpWTkioeTN6UPA7Z2FkoZVaowWtdVzdmrqg66IhMUxP4eBV8ZguHhNRVU0 ULF/EnswpZYxo2Ga0gqb8Ffpp9brRO3XjYO3RR3sQwtQrAKqWq80lXULp+DtlZPuVzUe ZJaqbh2PI0nxjjhCa9jsi5Paits+08+RYfItFVg7G6lym/yTLhyf4+EjCRJtN+Mg+5mS g7SMCv9w0K/wyHLVXWLUcDO85+RXmf2NoSHtIVo51VrR6e2tjMbyZNB3zWt7r2074XMm lL7A== X-Gm-Message-State: AODbwcD8kf9xYT+5BlpHnvB+xiT13TZ8wSWZwICVz/RjGihf+k02EDlq LIdEa7n916c+64xf 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland 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 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/linux/clockchips.h | 9 ------ 4 files changed, 73 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 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 */