From patchwork Wed May 20 09:06:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 48788 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EDCB221411 for ; Wed, 20 May 2015 09:12:03 +0000 (UTC) Received: by laat2 with SMTP id t2sf14988973laa.2 for ; Wed, 20 May 2015 02:12:02 -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: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=CPU4gOQSWSDRLzgUQ5wNhqxSi+Q+bIPNTHUnqYknvpk=; b=X5VZtHaMOD5/C5z1NdNe3YQcEIEw229Py/Q45VbdwUQ4FsC8f8AKnOtnyD9iddmBqD 8AOzu9fjx6uANBEck6P46tWVt7rpG+im+wlWxn1urUr9o0sEKSRu0wO/B87HrtmYYVni AYMp2lZB6/73Ys67cRiS2An6Syc1uMC0tI+PIwTfLlGpiLTQrGSyD4fmvHwfnPUFWG3E 1DCBLoFqqf5av7tTXXFiGh+34G8vir93n6KnmZxhO86/P9XRiAsnvL7kM+m5n2BtpbuR ikcbf70CgM9LqMdGqAGa8do66FW4oIeOGbBcDsymxaNsoORAU49DwOcBYpLYcsgBpTMk z/CA== X-Gm-Message-State: ALoCoQn+ZLAbHthh78Lzh4IXyAsoUfOumAiievLsN96dGEPMFegSRw6afjKxxHCF+5Pb1KZMZUyP X-Received: by 10.112.13.200 with SMTP id j8mr25649662lbc.14.1432113122902; Wed, 20 May 2015 02:12:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.100 with SMTP id j4ls172121lah.92.gmail; Wed, 20 May 2015 02:12:02 -0700 (PDT) X-Received: by 10.112.134.167 with SMTP id pl7mr24899489lbb.50.1432113122530; Wed, 20 May 2015 02:12:02 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id z9si10778596laj.152.2015.05.20.02.12.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 May 2015 02:12:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laat2 with SMTP id t2so63778857laa.1 for ; Wed, 20 May 2015 02:12:02 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr25633400lad.56.1432113122098; Wed, 20 May 2015 02:12:02 -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.108.230 with SMTP id hn6csp1385686lbb; Wed, 20 May 2015 02:12:00 -0700 (PDT) X-Received: by 10.68.136.134 with SMTP id qa6mr62643242pbb.66.1432113120171; Wed, 20 May 2015 02:12:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id px1si1525616pbb.240.2015.05.20.02.11.34; Wed, 20 May 2015 02:12:00 -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 S1753145AbbETJLU (ORCPT + 28 others); Wed, 20 May 2015 05:11:20 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33433 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752785AbbETJLM (ORCPT ); Wed, 20 May 2015 05:11:12 -0400 Received: by padbw4 with SMTP id bw4so60204724pad.0 for ; Wed, 20 May 2015 02:11:11 -0700 (PDT) X-Received: by 10.68.102.1 with SMTP id fk1mr62753629pbb.56.1432113071901; Wed, 20 May 2015 02:11:11 -0700 (PDT) Received: from localhost ([122.167.226.34]) by mx.google.com with ESMTPSA id ux6sm15530152pab.24.2015.05.20.02.11.10 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 20 May 2015 02:11:11 -0700 (PDT) From: Viresh Kumar To: Thomas Gleixner Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Viresh Kumar Subject: [PATCH 1/2] clockevents: Move 'enum clock_event_state' to tick-internal.h Date: Wed, 20 May 2015 14:36:55 +0530 Message-Id: <6d69a7858bc0fcc19936ab0809cbf1a0f4785a67.1432112458.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: 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: viresh.kumar@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.54 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: , CLOCK_EVT_STATE_* symbols are local to the kernel/time and shouldn't be exposed to other parts of the kernel. They were added to clockchips.h as there was one external user (arch/arm/common/bL_switcher.c). That is modified now to not use these symbols directly: 7270d11c56f5 ("arm/bL_switcher: Kill tick suspend hackery") We can now move them to a file local to kernel/time. Signed-off-by: Viresh Kumar --- include/linux/clockchips.h | 23 +---------------------- kernel/time/tick-internal.h | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 271fa4c8eb29..62d3007f8a8c 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -28,27 +28,6 @@ enum clock_event_mode { }; /* - * Possible states of a clock event device. - * - * DETACHED: Device is not used by clockevents core. Initial state or can be - * reached from SHUTDOWN. - * SHUTDOWN: Device is powered-off. Can be reached from PERIODIC or ONESHOT. - * PERIODIC: Device is programmed to generate events periodically. Can be - * reached from DETACHED or SHUTDOWN. - * ONESHOT: Device is programmed to generate event only once. Can be reached - * from DETACHED or SHUTDOWN. - * ONESHOT_STOPPED: Device was programmed in ONESHOT mode and is temporarily - * stopped. - */ -enum clock_event_state { - CLOCK_EVT_STATE_DETACHED, - CLOCK_EVT_STATE_SHUTDOWN, - CLOCK_EVT_STATE_PERIODIC, - CLOCK_EVT_STATE_ONESHOT, - CLOCK_EVT_STATE_ONESHOT_STOPPED, -}; - -/* * Clock event features */ # define CLOCK_EVT_FEAT_PERIODIC 0x000001 @@ -117,7 +96,7 @@ struct clock_event_device { u32 mult; u32 shift; enum clock_event_mode mode; - enum clock_event_state state; + unsigned int state; unsigned int features; unsigned long retries; diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index 65273f0a11ed..04820f64146e 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -12,6 +12,27 @@ # define TICK_DO_TIMER_NONE -1 # define TICK_DO_TIMER_BOOT -2 +/* + * Possible states of a clock event device. + * + * DETACHED: Device is not used by clockevents core. Initial state or can be + * reached from SHUTDOWN. + * SHUTDOWN: Device is powered-off. Can be reached from PERIODIC or ONESHOT. + * PERIODIC: Device is programmed to generate events periodically. Can be + * reached from DETACHED or SHUTDOWN. + * ONESHOT: Device is programmed to generate event only once. Can be reached + * from DETACHED or SHUTDOWN. + * ONESHOT_STOPPED: Device was programmed in ONESHOT mode and is temporarily + * stopped. + */ +enum clock_event_state { + CLOCK_EVT_STATE_DETACHED, + CLOCK_EVT_STATE_SHUTDOWN, + CLOCK_EVT_STATE_PERIODIC, + CLOCK_EVT_STATE_ONESHOT, + CLOCK_EVT_STATE_ONESHOT_STOPPED, +}; + DECLARE_PER_CPU(struct tick_device, tick_cpu_device); extern ktime_t tick_next_period; extern ktime_t tick_period;