From patchwork Thu Apr 30 14:44:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenwei Wang X-Patchwork-Id: 6305131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8C5429F373 for ; Thu, 30 Apr 2015 15:00:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DED4E201EF for ; Thu, 30 Apr 2015 15:00:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30D3720145 for ; Thu, 30 Apr 2015 15:00:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ynpti-0006Q0-CK; Thu, 30 Apr 2015 14:57:06 +0000 Received: from mail-bn1on0114.outbound.protection.outlook.com ([157.56.110.114] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ynpkp-0005jo-FT for linux-arm-kernel@lists.infradead.org; Thu, 30 Apr 2015 14:47:56 +0000 Received: from BLUPR0301CA0038.namprd03.prod.outlook.com (25.162.113.176) by BY2PR03MB460.namprd03.prod.outlook.com (10.141.141.148) with Microsoft SMTP Server (TLS) id 15.1.148.15; Thu, 30 Apr 2015 14:47:29 +0000 Received: from BL2FFO11FD051.protection.gbl (2a01:111:f400:7c09::140) by BLUPR0301CA0038.outlook.office365.com (2a01:111:e400:5259::48) with Microsoft SMTP Server (TLS) id 15.1.130.23 via Frontend Transport; Thu, 30 Apr 2015 14:47:28 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.infradead.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD051.mail.protection.outlook.com (10.173.161.213) with Microsoft SMTP Server (TLS) id 15.1.154.14 via Frontend Transport; Thu, 30 Apr 2015 14:47:28 +0000 Received: from [az84smr01.freescale.net (B38339-11.am.freescale.net [10.81.92.140]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t3UEieih026417; Thu, 30 Apr 2015 07:47:26 -0700 From: Shenwei Wang To: Subject: [PATCH 16/18] ARM: imx: Move the variable clockevent_mode into mxc_set_mode Date: Thu, 30 Apr 2015 09:44:31 -0500 Message-ID: <1430405073-13106-17-git-send-email-shenwei.wang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430405073-13106-1-git-send-email-shenwei.wang@freescale.com> References: <1430405073-13106-1-git-send-email-shenwei.wang@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(979002)(6009001)(339900001)(189002)(199003)(33646002)(2351001)(50226001)(46102003)(77096005)(92566002)(85426001)(64706001)(110136002)(5001960100002)(68736005)(2950100001)(104016003)(50986999)(106466001)(229853001)(81156007)(6806004)(86362001)(87936001)(4001540100001)(62966003)(5001920100001)(77156002)(36756003)(19580395003)(97736004)(76176999)(50466002)(105606002)(47776003)(48376002)(19580405001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB460; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB460; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2PR03MB460; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB460; X-Forefront-PRVS: 056297E276 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2015 14:47:28.2908 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB460 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150430_074755_861260_A7D9529D X-CRM114-Status: UNSURE ( 7.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The global variable "clockevent_mode" was moved into the function of mxc_set_mode. Signed-off-by: Shenwei Wang --- arch/arm/mach-imx/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 836d255..da4dc29 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -98,7 +98,6 @@ struct imx_timer { }; static struct clock_event_device clockevent_mxc; -static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; static void gpt_irq_disable_v0_v1(struct imx_timer *tm) { @@ -226,6 +225,7 @@ static void mxc_set_mode(enum clock_event_mode mode, { unsigned long flags; struct imx_timer *tm = container_of(evt, struct imx_timer, evt); + static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; /* * The timer interrupt generation is disabled at least