From patchwork Mon Aug 10 09:51:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52210 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id CC9872152A for ; Mon, 10 Aug 2015 10:11:13 +0000 (UTC) Received: by wijp15 with SMTP id p15sf37118641wij.3 for ; Mon, 10 Aug 2015 03:11:13 -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=WyruGP7AB1/rkIIt3ts4hCeEHCv8X82KGu7WckJS4Kc=; b=G95kox5D+ABU9RQ5LN3Aj7WU4m4ksmwBMEWaQA6rnzptSeotfmEBObrZICw9y9Cn9A s5cOjqW1xBMJmBoiZMSHIU5oNl0O3VlCDbWvkOi/ugk7HavqxjGTpzmzd2GPIC5k4wPu KQ3sTluSTe65he5VqbUP0ldmdnGFdm+WhD5zEiOoUwaiZ3sn1vAL5hidyN7iEzuRt/S0 NzFdH1/s/WOAEj98Z/8zw9jFb6gswmdsNuWC+cysPrOHSY9EsUMXCHK9WmfBOt4ZP6tb obaubtxlBkI6vwiWwveFGJ12v1SgMb2vyuY4eQZWhzOWqNbqNN/KWHxRGWZ10fHSlq/2 iGEw== X-Gm-Message-State: ALoCoQkRodoLz+PP3dWx2vvTPMoiOh7S4kQWsv+j4at+V32Lo8HmIKshcXz1DUSOq201v75mr5DF X-Received: by 10.180.186.36 with SMTP id fh4mr3453475wic.7.1439201473155; Mon, 10 Aug 2015 03:11:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.65 with SMTP id r1ls85983lag.31.gmail; Mon, 10 Aug 2015 03:11:12 -0700 (PDT) X-Received: by 10.112.180.201 with SMTP id dq9mr19759628lbc.78.1439201472947; Mon, 10 Aug 2015 03:11:12 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id k3si2899391laf.118.2015.08.10.03.11.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 03:11:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labd1 with SMTP id d1so37275883lab.1 for ; Mon, 10 Aug 2015 03:11:12 -0700 (PDT) X-Received: by 10.152.36.161 with SMTP id r1mr19455761laj.88.1439201472802; Mon, 10 Aug 2015 03:11:12 -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 l6csp1836219lba; Mon, 10 Aug 2015 03:11:11 -0700 (PDT) X-Received: by 10.68.252.225 with SMTP id zv1mr42472958pbc.45.1439201470904; Mon, 10 Aug 2015 03:11:10 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yg10si32242256pbc.222.2015.08.10.03.11.09; Mon, 10 Aug 2015 03:11:10 -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 S933575AbbHJKLH (ORCPT + 28 others); Mon, 10 Aug 2015 06:11:07 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:35568 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932832AbbHJJxs (ORCPT ); Mon, 10 Aug 2015 05:53:48 -0400 Received: by wicne3 with SMTP id ne3so15321282wic.0 for ; Mon, 10 Aug 2015 02:53:47 -0700 (PDT) X-Received: by 10.180.23.33 with SMTP id j1mr21726154wif.44.1439200427643; Mon, 10 Aug 2015 02:53:47 -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.53.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:53:47 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Xiubo Li Subject: [PATCH 16/74] clockevents/drivers/fsl_ftm: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:51:33 +0200 Message-Id: <1439200352-26767-16-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.43 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 fsl_ftm 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: Xiubo Li Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- drivers/clocksource/fsl_ftm_timer.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 454227d..ef43469 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -153,19 +153,16 @@ static int ftm_set_next_event(unsigned long delta, return 0; } -static void ftm_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +static int ftm_set_oneshot(struct clock_event_device *evt) { - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - ftm_set_next_event(priv->periodic_cyc, evt); - break; - case CLOCK_EVT_MODE_ONESHOT: - ftm_counter_disable(priv->clkevt_base); - break; - default: - return; - } + ftm_counter_disable(priv->clkevt_base); + return 0; +} + +static int ftm_set_periodic(struct clock_event_device *evt) +{ + ftm_set_next_event(priv->periodic_cyc, evt); + return 0; } static irqreturn_t ftm_evt_interrupt(int irq, void *dev_id) @@ -174,7 +171,7 @@ static irqreturn_t ftm_evt_interrupt(int irq, void *dev_id) ftm_irq_acknowledge(priv->clkevt_base); - if (likely(evt->mode == CLOCK_EVT_MODE_ONESHOT)) { + if (likely(clockevent_state_oneshot(evt))) { ftm_irq_disable(priv->clkevt_base); ftm_counter_disable(priv->clkevt_base); } @@ -185,11 +182,13 @@ static irqreturn_t ftm_evt_interrupt(int irq, void *dev_id) } static struct clock_event_device ftm_clockevent = { - .name = "Freescale ftm timer", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = ftm_set_mode, - .set_next_event = ftm_set_next_event, - .rating = 300, + .name = "Freescale ftm timer", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_periodic = ftm_set_periodic, + .set_state_oneshot = ftm_set_oneshot, + .set_next_event = ftm_set_next_event, + .rating = 300, }; static struct irqaction ftm_timer_irq = {