From patchwork Mon Aug 10 09:52:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 52170 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 2834A2152A for ; Mon, 10 Aug 2015 09:57:43 +0000 (UTC) Received: by wicja10 with SMTP id ja10sf12236291wic.2 for ; Mon, 10 Aug 2015 02:57:42 -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=DvLkJmVnj2QQNXyOwEI61ojhj4EKNQ0jcpfPlIVC+So=; b=g3gibQwwULCCyqlXDj1JktCR139v2WFiimMFCfyhaRrwiL/m5Vi3pv8+BYQTj04Lsh o7COEQFPe02tUo6Yu/+anDPztA1dpeJ2fE0kGpzFLGf4ahwa0hxaRqNguOCOpBebBEf4 JI2BI9Wc1xTMtwTNkDA9Ih0XJDKhKLS7lZInPCflvr9jZAKhHaHtMK4bSpXCttEFWak6 VDDbY+/5ZUnf9s5J+exMuLbSsWB7s5iiNgG8RwNpgYjDpdAagZyd7xPK0jVzDu8ppKpw U10Z6Xj2Sy4L2CzKGuCqMJmzIog0HrvxD56G9dnRCapotLKSSULdc86ZZJBzRb3EXuE7 SCXg== X-Gm-Message-State: ALoCoQnaSj9HY5H8b5VOyb4VW6ppZSX1nVqbSHuqcmmxCB1OWvW9Y7cQmEZf1j88CjBWSL2Ah0GZ X-Received: by 10.112.218.10 with SMTP id pc10mr6022033lbc.8.1439200662447; Mon, 10 Aug 2015 02:57:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.7 with SMTP id bc7ls702742lab.74.gmail; Mon, 10 Aug 2015 02:57:42 -0700 (PDT) X-Received: by 10.112.205.161 with SMTP id lh1mr19489242lbc.43.1439200662130; Mon, 10 Aug 2015 02:57:42 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id r4si1726150laj.60.2015.08.10.02.57.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 02:57:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagz9 with SMTP id z9so50672384lag.3 for ; Mon, 10 Aug 2015 02:57:42 -0700 (PDT) X-Received: by 10.152.164.130 with SMTP id yq2mr12788308lab.76.1439200662014; Mon, 10 Aug 2015 02:57:42 -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 l6csp1829009lba; Mon, 10 Aug 2015 02:57:40 -0700 (PDT) X-Received: by 10.70.54.103 with SMTP id i7mr43104244pdp.97.1439200660163; Mon, 10 Aug 2015 02:57:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gk2si32398021pac.68.2015.08.10.02.57.35; Mon, 10 Aug 2015 02:57:40 -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 S1754798AbbHJJ5Q (ORCPT + 28 others); Mon, 10 Aug 2015 05:57:16 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:35968 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754746AbbHJJ5M (ORCPT ); Mon, 10 Aug 2015 05:57:12 -0400 Received: by wicja10 with SMTP id ja10so30405456wic.1 for ; Mon, 10 Aug 2015 02:57:11 -0700 (PDT) X-Received: by 10.194.121.131 with SMTP id lk3mr40832192wjb.77.1439200631358; Mon, 10 Aug 2015 02:57:11 -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.57.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Aug 2015 02:57:10 -0700 (PDT) From: Daniel Lezcano To: mingo@kernel.org Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Viresh Kumar , Jeff Dike , Richard Weinberger , user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net Subject: [PATCH 70/74] um/time: Migrate to new 'set-state' interface Date: Mon, 10 Aug 2015 11:52:27 +0200 Message-Id: <1439200352-26767-70-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.50 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 um 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: Jeff Dike Cc: Richard Weinberger Cc: user-mode-linux-devel@lists.sourceforge.net Cc: user-mode-linux-user@lists.sourceforge.net Signed-off-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- arch/um/kernel/time.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 117568d..5af441e 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -22,23 +22,16 @@ void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs) local_irq_restore(flags); } -static void itimer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +static int itimer_shutdown(struct clock_event_device *evt) { - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - set_interval(); - break; - - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_ONESHOT: - disable_timer(); - break; - - case CLOCK_EVT_MODE_RESUME: - break; - } + disable_timer(); + return 0; +} + +static int itimer_set_periodic(struct clock_event_device *evt) +{ + set_interval(); + return 0; } static int itimer_next_event(unsigned long delta, @@ -48,14 +41,17 @@ static int itimer_next_event(unsigned long delta, } static struct clock_event_device itimer_clockevent = { - .name = "itimer", - .rating = 250, - .cpumask = cpu_all_mask, - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = itimer_set_mode, - .set_next_event = itimer_next_event, - .shift = 32, - .irq = 0, + .name = "itimer", + .rating = 250, + .cpumask = cpu_all_mask, + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = itimer_shutdown, + .set_state_periodic = itimer_set_periodic, + .set_state_oneshot = itimer_shutdown, + .set_next_event = itimer_next_event, + .shift = 32, + .irq = 0, }; static irqreturn_t um_timer(int irq, void *dev)