From patchwork Thu Apr 24 21:44:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 4056261 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1631E9F1F4 for ; Thu, 24 Apr 2014 22:47:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E20A201DC for ; Thu, 24 Apr 2014 22:47:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D380120295 for ; Thu, 24 Apr 2014 22:47:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759031AbaDXWq5 (ORCPT ); Thu, 24 Apr 2014 18:46:57 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:40996 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754454AbaDXVpB (ORCPT ); Thu, 24 Apr 2014 17:45:01 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3OLiUYb025627; Thu, 24 Apr 2014 16:44:30 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3OLiUt4009710; Thu, 24 Apr 2014 16:44:30 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Thu, 24 Apr 2014 16:44:30 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3OLiUBD012936; Thu, 24 Apr 2014 16:44:30 -0500 Received: from joel-laptop.am.dhcp.ti.com (joel-laptop.am.dhcp.ti.com [10.247.29.57]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id s3OLiTt29833; Thu, 24 Apr 2014 16:44:29 -0500 (CDT) From: Joel Fernandes To: Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List CC: Tony Lindgren , Joel Fernandes Subject: [PATCH 26/26] ARM: OMAP: dmtimer: Use is_timer_available function in omap_dm_timer_trigger Date: Thu, 24 Apr 2014 16:44:09 -0500 Message-ID: <1398375849-6017-27-git-send-email-joelf@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398375849-6017-1-git-send-email-joelf@ti.com> References: <1398375849-6017-1-git-send-email-joelf@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Timer availability can be checked with is_timer_available function. Move it before omap_dm_timer_trigger and use it. Signed-off-by: Joel Fernandes --- arch/arm/plat-omap/dmtimer.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 1059881..0d0e83b 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -221,6 +221,19 @@ int omap_dm_timer_reserve_systimer(int id) return 0; } +static int is_timer_available(struct omap_dm_timer *timer) +{ + if (timer && timer->systimer) + return 1; + + if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) { + pr_err("Timer not available or enabled.\n"); + WARN_ON(1); + return 0; + } + return 1; +} + void omap_dm_timer_init_regs(struct omap_dm_timer *timer) { u32 tidr; @@ -524,7 +537,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_get_fclk); int omap_dm_timer_trigger(struct omap_dm_timer *timer) { - if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) { + if (!is_timer_available(timer)) { pr_err("%s: timer not available or enabled.\n", __func__); return -EINVAL; } @@ -867,19 +880,6 @@ int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask) } EXPORT_SYMBOL_GPL(omap_dm_timer_set_int_disable); -static int is_timer_available(struct omap_dm_timer *timer) -{ - if (timer && timer->systimer) - return 1; - - if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) { - pr_err("Timer not available or enabled.\n"); - WARN_ON(1); - return 0; - } - return 1; -} - unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer) { unsigned int l;