From patchwork Tue May 4 14:15:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 96801 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o44EF35S020214 for ; Tue, 4 May 2010 14:15:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599Ab0EDOPB (ORCPT ); Tue, 4 May 2010 10:15:01 -0400 Received: from mail.gmx.net ([213.165.64.20]:60525 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752856Ab0EDOPA (ORCPT ); Tue, 4 May 2010 10:15:00 -0400 Received: (qmail invoked by alias); 04 May 2010 14:14:58 -0000 Received: from p57BD25F8.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.37.248] by mail.gmx.net (mp054) with SMTP; 04 May 2010 16:14:58 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX18X4thpqSYXWi0zue92sUnWxOVI2ssE4ji2z62wNH AXlHNd0EtU5rtN Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1O9Itx-00024Z-R3 for linux-sh@vger.kernel.org; Tue, 04 May 2010 16:15:09 +0200 Date: Tue, 4 May 2010 16:15:09 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" Subject: [PATCH] sh: simplify WARN usage in SH clock driver Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 04 May 2010 14:15:05 +0000 (UTC) diff --git a/drivers/sh/clk.c b/drivers/sh/clk.c index f8c1740..b0cfb75 100644 --- a/drivers/sh/clk.c +++ b/drivers/sh/clk.c @@ -163,12 +163,9 @@ void propagate_rate(struct clk *tclk) static void __clk_disable(struct clk *clk) { - if (clk->usecount == 0) { - printk(KERN_ERR "Trying disable clock %s with 0 usecount\n", - clk->name); - WARN_ON(1); + if (WARN(!clk->usecount, "Trying to disable clock %s with 0 usecount\n", + clk->name)) return; - } if (!(--clk->usecount)) { if (likely(clk->ops && clk->ops->disable))