From patchwork Mon Aug 10 09:51:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52205 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 0146B2152A for ; Mon, 10 Aug 2015 10:08:49 +0000 (UTC) Received: by lbsm2 with SMTP id m2sf23930489lbs.1 for ; Mon, 10 Aug 2015 03:08:47 -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=hbA7AA541M0cBVG5B1bxO6s4ZJKR5CUeeNZ1zziX/+U=; b=Jt1qEogLeKdRqWp5eWfE6APYxGwxj6Lild7/SpGYdCXFGR8sjnjGfxNpMK2sLuwGsX 154v3LKiAl97Pt8+OHyjsKTVThG1ZuChsrXTbjqys6UigGuQiin0iPqHToQgtthGN8jO Q4OaZQOLFxmCCrmYibjAOO5HYsnHYF+ak5VFzI/gg497iLi4Yh+se6rlON2nPAeUukFn EOrgcqXXQrJIXdvEnYv7Esbx/x9445ADnYc7vdjS2Oc/ERaSEC4K9F5yUJL+cRbuvV2D wgRpyrrbp0mgnKXjFZMBFauMo71ALLhu1qUZkbbza+q45vRYcXHyzT+S4isD9o7d+GPV EDtg== X-Gm-Message-State: ALoCoQl3NVVUn2D8tOAi20XT9jmgZzTAol8YIgh1ayXCrr2Pqs4fCHt7RZgev61Pma7K7jdIeXdV X-Received: by 10.180.100.71 with SMTP id ew7mr2815096wib.0.1439201327903; Mon, 10 Aug 2015 03:08:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.101 with SMTP id z5ls668421laz.65.gmail; Mon, 10 Aug 2015 03:08:47 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr15897443lac.11.1439201327584; Mon, 10 Aug 2015 03:08:47 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id bc7si13732568lbc.144.2015.08.10.03.08.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 03:08:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labd1 with SMTP id d1so37246380lab.1 for ; Mon, 10 Aug 2015 03:08:47 -0700 (PDT) X-Received: by 10.152.28.193 with SMTP id d1mr5752964lah.72.1439201327439; Mon, 10 Aug 2015 03:08:47 -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 l6csp1834894lba; Mon, 10 Aug 2015 03:08:46 -0700 (PDT) X-Received: by 10.66.121.74 with SMTP id li10mr42389354pab.73.1439201325569; Mon, 10 Aug 2015 03:08:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rn15si32401533pab.115.2015.08.10.03.08.44; Mon, 10 Aug 2015 03:08:45 -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 S933458AbbHJKIc (ORCPT + 28 others); Mon, 10 Aug 2015 06:08:32 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:34021 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932968AbbHJJyE (ORCPT ); Mon, 10 Aug 2015 05:54:04 -0400 Received: by wicne3 with SMTP id ne3so128856625wic.1 for ; Mon, 10 Aug 2015 02:54:02 -0700 (PDT) X-Received: by 10.194.2.51 with SMTP id 19mr45283237wjr.40.1439200442290; Mon, 10 Aug 2015 02:54:02 -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.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:54:01 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Robert Jarzmik , Russell King Subject: [PATCH 25/74] clockevents/drivers/pxa: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:51:42 +0200 Message-Id: <1439200352-26767-25-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.45 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 pxa 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. Both oneshot and shutdown modes had exactly same code and so only a single callback is sufficient now, which will be called for both the modes. Cc: Robert Jarzmik Cc: Russell King Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano Acked-by: Robert Jarzmik --- drivers/clocksource/pxa_timer.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/drivers/clocksource/pxa_timer.c b/drivers/clocksource/pxa_timer.c index d9438af..45b6a49 100644 --- a/drivers/clocksource/pxa_timer.c +++ b/drivers/clocksource/pxa_timer.c @@ -88,26 +88,12 @@ pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev) return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0; } -static void -pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev) +static int pxa_osmr0_shutdown(struct clock_event_device *evt) { - switch (mode) { - case CLOCK_EVT_MODE_ONESHOT: - timer_writel(timer_readl(OIER) & ~OIER_E0, OIER); - timer_writel(OSSR_M0, OSSR); - break; - - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - /* initializing, released, or preparing for suspend */ - timer_writel(timer_readl(OIER) & ~OIER_E0, OIER); - timer_writel(OSSR_M0, OSSR); - break; - - case CLOCK_EVT_MODE_RESUME: - case CLOCK_EVT_MODE_PERIODIC: - break; - } + /* initializing, released, or preparing for suspend */ + timer_writel(timer_readl(OIER) & ~OIER_E0, OIER); + timer_writel(OSSR_M0, OSSR); + return 0; } #ifdef CONFIG_PM @@ -147,13 +133,14 @@ static void pxa_timer_resume(struct clock_event_device *cedev) #endif static struct clock_event_device ckevt_pxa_osmr0 = { - .name = "osmr0", - .features = CLOCK_EVT_FEAT_ONESHOT, - .rating = 200, - .set_next_event = pxa_osmr0_set_next_event, - .set_mode = pxa_osmr0_set_mode, - .suspend = pxa_timer_suspend, - .resume = pxa_timer_resume, + .name = "osmr0", + .features = CLOCK_EVT_FEAT_ONESHOT, + .rating = 200, + .set_next_event = pxa_osmr0_set_next_event, + .set_state_shutdown = pxa_osmr0_shutdown, + .set_state_oneshot = pxa_osmr0_shutdown, + .suspend = pxa_timer_suspend, + .resume = pxa_timer_resume, }; static struct irqaction pxa_ost0_irq = {