Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932643AbaDXWuW (ORCPT ); Thu, 24 Apr 2014 18:50:22 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:53144 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754121AbaDXVou (ORCPT ); Thu, 24 Apr 2014 17:44:50 -0400 From: Joel Fernandes To: Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List CC: Tony Lindgren , Joel Fernandes Subject: [PATCH 08/26] ARM: OMAP: dmtimer: Add function to check for timer availability Date: Thu, 24 Apr 2014 16:43:51 -0500 Message-ID: <1398375849-6017-9-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 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify the check for a timer availability in atleast 4 places by providing a function to do the same. Signed-off-by: Joel Fernandes --- arch/arm/plat-omap/dmtimer.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 8a4a97c..7e806f9 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -704,14 +704,22 @@ 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 (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; - if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) { - pr_err("%s: timer not available or enabled.\n", __func__); + if (!is_timer_available(timer)) return 0; - } l = __raw_readl(timer->irq_stat); @@ -721,7 +729,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_read_status); int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value) { - if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) + if (!is_timer_available(timer)) return -EINVAL; __omap_dm_timer_write_status(timer, value); @@ -732,10 +740,8 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_write_status); unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer) { - if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) { - pr_err("%s: timer not iavailable or enabled.\n", __func__); + if (!is_timer_available(timer)) return 0; - } return __omap_dm_timer_read_counter(timer, timer->posted); } @@ -743,10 +749,8 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_read_counter); int omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value) { - if (unlikely(!timer || pm_runtime_suspended(&timer->pdev->dev))) { - pr_err("%s: timer not available or enabled.\n", __func__); + if (!is_timer_available(timer)) return -EINVAL; - } omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, value); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/