From patchwork Mon Aug 10 09:51:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52191 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 41B5B2152A for ; Mon, 10 Aug 2015 10:02:27 +0000 (UTC) Received: by wijp15 with SMTP id p15sf37037638wij.3 for ; Mon, 10 Aug 2015 03:02:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=AkaMJBatXRH+Q77LjWszZ8D+8pHKfD/sNIC19FIT7kg=; b=DZH7mmoyeIR08lLRwrp2JnnBhgDrfIdVoSiW02kfGFWNe9u89NUcNqoGOunFBDR60L tw43tjhKd/Sf94VNM1aCEsIdyVe2ohRj9rgvsaEfS6kZ3f2zgS0TS9k8GPoCBfWuw/8k cKYMVgKKUYoC+XCjcYIRYBZ+z7P7Chy6CRsMQaHqrocfuSqrGL9oKYPWboJDDd21MCYK Fr+dVjjuDtJGeFjpVb3MiSLdzNL/hQS+IUMFHbFQAdIVK8XA2P2nUU3mFZY64rBdbh8L //i5wopmz94BL9q7PJKtGX63lSxeZ1nmWlUurmZlCf+fc+Is5JZ9Z/abM7ic7PDCfKZv GHAw== X-Gm-Message-State: ALoCoQn3XKXZuXavkecn2yX9nvG7CYFOnC3/CV3qJTvETsWvYMsDe4Sksy5pYhyQr8n22Of8TehZ X-Received: by 10.180.75.49 with SMTP id z17mr3451469wiv.7.1439200946515; Mon, 10 Aug 2015 03:02:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.65 with SMTP id r1ls84870lag.31.gmail; Mon, 10 Aug 2015 03:02:26 -0700 (PDT) X-Received: by 10.152.7.37 with SMTP id g5mr19518972laa.101.1439200946099; Mon, 10 Aug 2015 03:02:26 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id us13si13793811lbb.12.2015.08.10.03.02.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 03:02:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbpu9 with SMTP id pu9so64640171lbb.3 for ; Mon, 10 Aug 2015 03:02:26 -0700 (PDT) X-Received: by 10.112.176.228 with SMTP id cl4mr19551877lbc.106.1439200945872; Mon, 10 Aug 2015 03:02:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1831372lba; Mon, 10 Aug 2015 03:02:24 -0700 (PDT) X-Received: by 10.67.15.67 with SMTP id fm3mr42207041pad.114.1439200944574; Mon, 10 Aug 2015 03:02:24 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id s6si28744970pdj.238.2015.08.10.03.02.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 03:02:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZOjt6-0005dc-JQ; Mon, 10 Aug 2015 10:01:00 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZOjn5-0006Jj-0C for linux-arm-kernel@bombadil.infradead.org; Mon, 10 Aug 2015 09:54:47 +0000 Received: from mail-wi0-f177.google.com ([209.85.212.177]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZOjn2-0007LF-5u for linux-arm-kernel@lists.infradead.org; Mon, 10 Aug 2015 09:54:45 +0000 Received: by wicja10 with SMTP id ja10so30319046wic.1 for ; Mon, 10 Aug 2015 02:54:19 -0700 (PDT) X-Received: by 10.180.23.33 with SMTP id j1mr21729619wif.44.1439200459619; Mon, 10 Aug 2015 02:54:19 -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 jr5sm28598154wjc.14.2015.08.10.02.54.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:54:19 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Subject: [PATCH 37/74] clockevents/drivers/atlas7: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:51:54 +0200 Message-Id: <1439200352-26767-37-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439200352-26767-1-git-send-email-daniel.lezcano@linaro.org> References: <55C87382.4070309@linaro.org> <1439200352-26767-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150810_105444_236984_4314B173 X-CRM114-Status: GOOD ( 14.42 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on casper.infradead.org summary: Content analysis details: (-2.6 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.177 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: "moderated list:ARM/CSR SIRFPRIMA..." , Viresh Kumar , tglx@linutronix.de, linux-kernel@vger.kernel.org, Barry Song MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Viresh Kumar Migrate atlas7 driver to the new 'set-state' interface provided by clockevents core, the earlier 'set-mode' interface is marked obsolete now. This also enables us to implement callbacks for new states of clockevent devices, for example: ONESHOT_STOPPED. Cc: Barry Song Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-atlas7.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/clocksource/timer-atlas7.c b/drivers/clocksource/timer-atlas7.c index 60f9de3..27fa136 100644 --- a/drivers/clocksource/timer-atlas7.c +++ b/drivers/clocksource/timer-atlas7.c @@ -76,7 +76,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id) /* clear timer interrupt */ writel_relaxed(BIT(cpu), sirfsoc_timer_base + SIRFSOC_TIMER_INTR_STATUS); - if (ce->mode == CLOCK_EVT_MODE_ONESHOT) + if (clockevent_state_oneshot(ce)) sirfsoc_timer_count_disable(cpu); ce->event_handler(ce); @@ -117,18 +117,11 @@ static int sirfsoc_timer_set_next_event(unsigned long delta, return 0; } -static void sirfsoc_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *ce) +/* Oneshot is enabled in set_next_event */ +static int sirfsoc_timer_shutdown(struct clock_event_device *evt) { - switch (mode) { - case CLOCK_EVT_MODE_ONESHOT: - /* enable in set_next_event */ - break; - default: - break; - } - sirfsoc_timer_count_disable(smp_processor_id()); + return 0; } static void sirfsoc_clocksource_suspend(struct clocksource *cs) @@ -193,7 +186,9 @@ static int sirfsoc_local_timer_setup(struct clock_event_device *ce) ce->name = "local_timer"; ce->features = CLOCK_EVT_FEAT_ONESHOT; ce->rating = 200; - ce->set_mode = sirfsoc_timer_set_mode; + ce->set_state_shutdown = sirfsoc_timer_shutdown; + ce->set_state_oneshot = sirfsoc_timer_shutdown; + ce->tick_resume = sirfsoc_timer_shutdown; ce->set_next_event = sirfsoc_timer_set_next_event; clockevents_calc_mult_shift(ce, atlas7_timer_rate, 60); ce->max_delta_ns = clockevent_delta2ns(-2, ce);