From patchwork Mon Aug 10 09:52:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52180 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 020042152A for ; Mon, 10 Aug 2015 10:00:17 +0000 (UTC) Received: by wicja10 with SMTP id ja10sf12259256wic.2 for ; Mon, 10 Aug 2015 03:00:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=tBgQf5+OorfLEsUQ7MpGeHVnTxD2kg+TdAG0MjM2iPU=; b=KLQjR2XQ1gtNY5GXdkwW7iApAOHk10ZRxY8KD4Js/SqlTZC2ZpJg2tlabBWuH0x+Lt cciBeBSpr0jC/9ctvBg9mUCuAfoAsu0f75WTz4qx4SbqAiSQivQ7lsjlr3Cxa1VNsT6K jOsqMIWMODniTbJ2/lW1dA74O16kTRCuFlVqjIhcle13x13HB3enD1rYHaqTw0SS32WK JkHsd+7n0K+iZB+BK9734d9PGiwekRj0kc8U9T4THACh+d92LGniQXVPrZBqbMS4gQm5 xao2j8bvh1JocnOfPXeaDu3E2hKCmivusdeSmSpq9wOiYSmlUzP2dYrWGogbxn3kr6iJ 5npA== X-Gm-Message-State: ALoCoQl9MxV5bpQI095kIekcsZ2iye+kOobHHTFyyy6Mv1MM8f8m0IJORtXMBj9u9XQGA+RF6KCh X-Received: by 10.180.81.70 with SMTP id y6mr2607068wix.2.1439200816237; Mon, 10 Aug 2015 03:00:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.39 with SMTP id p7ls649196lap.104.gmail; Mon, 10 Aug 2015 03:00:15 -0700 (PDT) X-Received: by 10.152.43.116 with SMTP id v20mr19528463lal.50.1439200815907; Mon, 10 Aug 2015 03:00:15 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id rb8si13780617lbb.34.2015.08.10.03.00.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 03:00:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lagz9 with SMTP id z9so50702974lag.3 for ; Mon, 10 Aug 2015 03:00:15 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr19264754lbb.36.1439200815676; Mon, 10 Aug 2015 03:00:15 -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 l6csp1830058lba; Mon, 10 Aug 2015 03:00:14 -0700 (PDT) X-Received: by 10.66.138.40 with SMTP id qn8mr42553976pab.19.1439200813715; Mon, 10 Aug 2015 03:00:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oh5si32230975pbb.168.2015.08.10.03.00.12; Mon, 10 Aug 2015 03:00:13 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755293AbbHJKAK (ORCPT + 28 others); Mon, 10 Aug 2015 06:00:10 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33956 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933204AbbHJJyw (ORCPT ); Mon, 10 Aug 2015 05:54:52 -0400 Received: by wicne3 with SMTP id ne3so128881582wic.1 for ; Mon, 10 Aug 2015 02:54:50 -0700 (PDT) X-Received: by 10.180.210.200 with SMTP id mw8mr22190445wic.26.1439200490870; Mon, 10 Aug 2015 02:54:50 -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.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:54:50 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Richard Henderson , Ivan Kokshaysky , Matt Turner , Christoph Lameter , linux-alpha@vger.kernel.org, Tejun Heo Subject: [PATCH 59/74] alpha/time: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:52:16 +0200 Message-Id: <1439200352-26767-59-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> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.215.51 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Viresh Kumar Migrate alpha 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. rtc clockevent device wasn't doing anything in set-mode and so its set-state callbacks aren't implemented. Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Christoph Lameter Cc: linux-alpha@vger.kernel.org Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- arch/alpha/kernel/time.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 643a9dc..5b6202a 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -93,7 +93,7 @@ rtc_timer_interrupt(int irq, void *dev) struct clock_event_device *ce = &per_cpu(cpu_ce, cpu); /* Don't run the hook for UNUSED or SHUTDOWN. */ - if (likely(ce->mode == CLOCK_EVT_MODE_PERIODIC)) + if (likely(clockevent_state_periodic(ce))) ce->event_handler(ce); if (test_irq_work_pending()) { @@ -104,13 +104,6 @@ rtc_timer_interrupt(int irq, void *dev) return IRQ_HANDLED; } -static void -rtc_ce_set_mode(enum clock_event_mode mode, struct clock_event_device *ce) -{ - /* The mode member of CE is updated in generic code. - Since we only support periodic events, nothing to do. */ -} - static int rtc_ce_set_next_event(unsigned long evt, struct clock_event_device *ce) { @@ -129,7 +122,6 @@ init_rtc_clockevent(void) .features = CLOCK_EVT_FEAT_PERIODIC, .rating = 100, .cpumask = cpumask_of(cpu), - .set_mode = rtc_ce_set_mode, .set_next_event = rtc_ce_set_next_event, }; @@ -161,12 +153,12 @@ static struct clocksource qemu_cs = { * The QEMU alarm as a clock_event_device primitive. */ -static void -qemu_ce_set_mode(enum clock_event_mode mode, struct clock_event_device *ce) +static int qemu_ce_shutdown(struct clock_event_device *ce) { /* The mode member of CE is updated for us in generic code. Just make sure that the event is disabled. */ qemu_set_alarm_abs(0); + return 0; } static int @@ -197,7 +189,9 @@ init_qemu_clockevent(void) .features = CLOCK_EVT_FEAT_ONESHOT, .rating = 400, .cpumask = cpumask_of(cpu), - .set_mode = qemu_ce_set_mode, + .set_state_shutdown = qemu_ce_shutdown, + .set_state_oneshot = qemu_ce_shutdown, + .tick_resume = qemu_ce_shutdown, .set_next_event = qemu_ce_set_next_event, };