From patchwork Thu Oct 6 17:30:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?V=C3=ADctor_Manuel_J=C3=A1quez_Leal?= X-Patchwork-Id: 118137 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3E4E9B6F89 for ; Fri, 7 Oct 2011 04:30:18 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RBrlt-0001LW-0h; Thu, 06 Oct 2011 17:30:13 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RBrls-0000P5-Oo; Thu, 06 Oct 2011 17:30:12 +0000 Received: from smtp4.mundo-r.com ([212.51.32.151]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RBrlp-0000Oh-PK for linux-arm-kernel@lists.infradead.org; Thu, 06 Oct 2011 17:30:10 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap4EAP3kjU5bdWOb/2dsb2JhbABDhHSkRIFUAQUjDwEjIxAlAiYCAjkDGwYBEogApyKRVoEthFMYgRQEk26IX4hp X-IronPort-AV: E=Sophos;i="4.68,497,1312149600"; d="scan'208";a="421558697" Received: from 155.99.117.91.static.mundo-r.com (HELO fanzine.igalia.com) ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 06 Oct 2011 19:30:05 +0200 Received: from maestria.local.igalia.com ([192.168.10.14] helo=mail.igalia.com) by fanzine.igalia.com with esmtps (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1RBrll-0001AZ-FD; Thu, 06 Oct 2011 19:30:05 +0200 Received: from ip148.dynamic.igalia.com ([192.168.10.148] helo=lit.local.igalia.com) by mail.igalia.com with esmtps (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1RBrll-0000Um-8c; Thu, 06 Oct 2011 19:30:05 +0200 Received: from vjaquez by lit.local.igalia.com with local (Exim 4.76) (envelope-from ) id 1RBrlk-0003GR-NX; Thu, 06 Oct 2011 19:30:04 +0200 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= To: Tony Lindgren , Joe Perches Subject: [PATCH v2] omap: dmtimer: convert printk to pr_err / WARN Date: Thu, 6 Oct 2011 19:30:02 +0200 Message-Id: <1317922204-12512-1-git-send-email-vjaquez@igalia.com> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1317898106-1891-1-git-send-email-vjaquez@igalia.com> References: <1317898106-1891-1-git-send-email-vjaquez@igalia.com> MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111006_133010_017833_46A7324D X-CRM114-Status: GOOD ( 10.88 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.51.32.151 listed in list.dnswl.org] Cc: Russell King , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Timo Teras , Harvey Harrison X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Convert a printk(KERN_ERR) message in the driver to pr_err(), and use WARN() instead of a custom log message with a stack dump. Signed-off-by: Víctor Manuel Jáquez Leal --- arch/arm/plat-omap/dmtimer.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index ee9f6eb..dead0f3 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -322,7 +322,7 @@ static void omap_dm_timer_wait_for_reset(struct omap_dm_timer *timer) while (!(omap_dm_timer_read_reg(timer, OMAP_TIMER_SYS_STAT_REG) & 1)) { c++; if (c > 100000) { - printk(KERN_ERR "Timer failed to reset\n"); + pr_err("Timer failed to reset\n"); return; } } @@ -397,9 +397,7 @@ struct omap_dm_timer *omap_dm_timer_request_specific(int id) spin_lock_irqsave(&dm_timer_lock, flags); if (id <= 0 || id > dm_timer_count || dm_timers[id-1].reserved) { spin_unlock_irqrestore(&dm_timer_lock, flags); - printk("BUG: warning at %s:%d/%s(): unable to get timer %d\n", - __FILE__, __LINE__, __func__, id); - dump_stack(); + WARN(1, "unable to get timer %d\n", id); return NULL; }