From patchwork Mon Aug 10 09:51:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52204 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 DA8DF2152A for ; Mon, 10 Aug 2015 10:08:16 +0000 (UTC) Received: by wicja10 with SMTP id ja10sf12335443wic.2 for ; Mon, 10 Aug 2015 03:08: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=aZEGvvZln/rdRG4EbrqjDQFWVrpegzMK8Ml0E/5DEPY=; b=iM6DF2fUH1fz5HVQzmzBDioS7Taybpwn/w4UuiUH9jZqOQg0VNvAWL0s5qo6zQr6bX kBNi0n5M85/xnEhNT+T2kERp035bnyu4lgsNC87lNPHaImv5TMtioXcznRF6L52o4NpS WSQ+CCXyrfpeU+w4UF4m06GHaM9Cnggzj9N6Q3cKBq6VftbzLA68mLAMNyUV8cOlDwHx 0GXrs1p37DcC0jxROwKQJGLQeKlAq+YRwXVrDKE2tbX8mg38c89Y3elPOH2RXTe1rV5T pS01oC9tbYd5J1H7bZ9sUcdstJy0zQEMSARf3ADcwDng8n9XnQ1zMpkT5maZlPsxbImg aRRg== X-Gm-Message-State: ALoCoQkjKVm86SEEqPWOTo306f+N861XCXwO0xnAUgqOjMjc6lS2QgtFxb9atCxr5muSnLROpqbI X-Received: by 10.180.89.104 with SMTP id bn8mr76905wib.4.1439201296164; Mon, 10 Aug 2015 03:08:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.80 with SMTP id v16ls1154laz.62.gmail; Mon, 10 Aug 2015 03:08:15 -0700 (PDT) X-Received: by 10.112.164.4 with SMTP id ym4mr19833555lbb.7.1439201295837; Mon, 10 Aug 2015 03:08:15 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id j10si13792730lbp.23.2015.08.10.03.08.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 03:08:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbsx3 with SMTP id sx3so8491581lbb.0 for ; Mon, 10 Aug 2015 03:08:15 -0700 (PDT) X-Received: by 10.112.145.169 with SMTP id sv9mr19466513lbb.73.1439201295541; Mon, 10 Aug 2015 03:08: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 l6csp1834612lba; Mon, 10 Aug 2015 03:08:14 -0700 (PDT) X-Received: by 10.68.247.226 with SMTP id yh2mr43490456pbc.12.1439201293550; Mon, 10 Aug 2015 03:08:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j2si32370785pdh.123.2015.08.10.03.08.12; Mon, 10 Aug 2015 03:08: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 S933296AbbHJKIL (ORCPT + 28 others); Mon, 10 Aug 2015 06:08:11 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:34055 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933109AbbHJJyF (ORCPT ); Mon, 10 Aug 2015 05:54:05 -0400 Received: by wicne3 with SMTP id ne3so128857552wic.1 for ; Mon, 10 Aug 2015 02:54:04 -0700 (PDT) X-Received: by 10.194.108.5 with SMTP id hg5mr45063680wjb.25.1439200443946; Mon, 10 Aug 2015 02:54:03 -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.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:54:03 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Stephen Boyd , Kumar Gala , Andy Gross , David Brown Subject: [PATCH 26/74] clockevents/drivers/qcom: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:51:43 +0200 Message-Id: <1439200352-26767-26-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.217.175 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 qcom 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. Periodic mode isn't supported by the driver and so the callback isn't provided anymore. Cc: Stephen Boyd Cc: Kumar Gala Cc: Andy Gross Cc: David Brown Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano Acked-by: Stephen Boyd --- drivers/clocksource/qcom-timer.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c index cba2d01..f8e09f9 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -47,7 +47,7 @@ static irqreturn_t msm_timer_interrupt(int irq, void *dev_id) { struct clock_event_device *evt = dev_id; /* Stop the timer tick */ - if (evt->mode == CLOCK_EVT_MODE_ONESHOT) { + if (clockevent_state_oneshot(evt)) { u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE); ctrl &= ~TIMER_ENABLE_EN; writel_relaxed(ctrl, event_base + TIMER_ENABLE); @@ -75,26 +75,14 @@ static int msm_timer_set_next_event(unsigned long cycles, return 0; } -static void msm_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +static int msm_timer_shutdown(struct clock_event_device *evt) { u32 ctrl; ctrl = readl_relaxed(event_base + TIMER_ENABLE); ctrl &= ~(TIMER_ENABLE_EN | TIMER_ENABLE_CLR_ON_MATCH_EN); - - switch (mode) { - case CLOCK_EVT_MODE_RESUME: - case CLOCK_EVT_MODE_PERIODIC: - break; - case CLOCK_EVT_MODE_ONESHOT: - /* Timer is enabled in set_next_event */ - break; - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - break; - } writel_relaxed(ctrl, event_base + TIMER_ENABLE); + return 0; } static struct clock_event_device __percpu *msm_evt; @@ -126,7 +114,9 @@ static int msm_local_timer_setup(struct clock_event_device *evt) evt->name = "msm_timer"; evt->features = CLOCK_EVT_FEAT_ONESHOT; evt->rating = 200; - evt->set_mode = msm_timer_set_mode; + evt->set_state_shutdown = msm_timer_shutdown; + evt->set_state_oneshot = msm_timer_shutdown; + evt->tick_resume = msm_timer_shutdown; evt->set_next_event = msm_timer_set_next_event; evt->cpumask = cpumask_of(cpu); @@ -147,7 +137,7 @@ static int msm_local_timer_setup(struct clock_event_device *evt) static void msm_local_timer_stop(struct clock_event_device *evt) { - evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); + evt->set_state_shutdown(evt); disable_percpu_irq(evt->irq); }