From patchwork Sat Apr 21 11:47:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: viresh kumar X-Patchwork-Id: 154206 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0110FB6FC3 for ; Sat, 21 Apr 2012 21:50:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752739Ab2DULuM (ORCPT ); Sat, 21 Apr 2012 07:50:12 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43826 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751984Ab2DULuI (ORCPT ); Sat, 21 Apr 2012 07:50:08 -0400 Received: by pbcun15 with SMTP id un15so2047883pbc.19 for ; Sat, 21 Apr 2012 04:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=nopRBHdQfZAhAxnOloo0i0HdRw6sM0MSeLy02y/t/w0=; b=vR3D6BY0z9ddhDHunLmI5byKWtFixX2ayoRlrLEN9Sl9uHlL1astaU2x/m/fWveflj 1/SafzL1wc3YYbFhTu9vCz2i9Wua8I+mvmtQV7JVs3wNdFqLADtk/1SdzZfE8X+ZyKjW SbsBK7S666TkLQMWEXL0cF2f3P6e2BsU4gZDNDs+K+y4Mua1GjA7zqug1lL61p6W9STh HZ8ejBZBH+dxISMa3eI+mPGQ34TSLNWJGTozRrlqWJT+KHvnG6lIB9RRGClEEvy7WmJa 75VJYErtYF5ZJq1PeNYTPCgO4yaQbidU+/tAjrqUD80W2cioICUdhPP5vD56cI8yvBju 56IA== Received: by 10.68.135.99 with SMTP id pr3mr8815103pbb.95.1335009008454; Sat, 21 Apr 2012 04:50:08 -0700 (PDT) Received: from localhost ([223.226.85.135]) by mx.google.com with ESMTPS id ox2sm8251394pbc.55.2012.04.21.04.49.53 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 21 Apr 2012 04:50:07 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: spear-devel@list.st.com, viresh.linux@gmail.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mturquette@linaro.org, sshtylyov@mvista.com, jgarzik@redhat.com, Viresh Kumar , linux-ide@vger.kernel.org Subject: [PATCH 04/13] ata/pata_arasan: Remove conditional compilation of clk code Date: Sat, 21 Apr 2012 17:17:31 +0530 Message-Id: X-Mailer: git-send-email 1.7.9 In-Reply-To: References: In-Reply-To: References: Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h, there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif macros. Signed-off-by: Viresh Kumar Cc: Jeff Garzik Cc: linux-ide@vger.kernel.org --- drivers/ata/pata_arasan_cf.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index fc2db2a..b370e35 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -184,10 +184,8 @@ struct arasan_cf_dev { /* pointer to ata_host structure */ struct ata_host *host; - /* clk structure, only if HAVE_CLK is defined */ -#ifdef CONFIG_HAVE_CLK + /* clk structure */ struct clk *clk; -#endif /* physical base address of controller */ dma_addr_t pbase; @@ -312,13 +310,13 @@ static int cf_init(struct arasan_cf_dev *acdev) unsigned long flags; int ret = 0; -#ifdef CONFIG_HAVE_CLK - ret = clk_enable(acdev->clk); - if (ret) { - dev_dbg(acdev->host->dev, "clock enable failed"); - return ret; + if (!IS_ERR(acdev->clk)) { + ret = clk_enable(acdev->clk); + if (ret) { + dev_dbg(acdev->host->dev, "clock enable failed"); + return ret; + } } -#endif spin_lock_irqsave(&acdev->host->lock, flags); /* configure CF interface clock */ @@ -344,9 +342,9 @@ static void cf_exit(struct arasan_cf_dev *acdev) writel(readl(acdev->vbase + OP_MODE) & ~CFHOST_ENB, acdev->vbase + OP_MODE); spin_unlock_irqrestore(&acdev->host->lock, flags); -#ifdef CONFIG_HAVE_CLK - clk_disable(acdev->clk); -#endif + + if (!IS_ERR(acdev->clk)) + clk_disable(acdev->clk); } static void dma_callback(void *dev) @@ -828,13 +826,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev) return -ENOMEM; } -#ifdef CONFIG_HAVE_CLK acdev->clk = clk_get(&pdev->dev, NULL); - if (IS_ERR(acdev->clk)) { + if (IS_ERR(acdev->clk)) dev_warn(&pdev->dev, "Clock not found\n"); - return PTR_ERR(acdev->clk); - } -#endif /* allocate host */ host = ata_host_alloc(&pdev->dev, 1); @@ -899,9 +893,8 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev) &arasan_cf_sht); free_clk: -#ifdef CONFIG_HAVE_CLK - clk_put(acdev->clk); -#endif + if (!IS_ERR(acdev->clk)) + clk_put(acdev->clk); return ret; } @@ -912,9 +905,9 @@ static int __devexit arasan_cf_remove(struct platform_device *pdev) ata_host_detach(host); cf_exit(acdev); -#ifdef CONFIG_HAVE_CLK - clk_put(acdev->clk); -#endif + + if (!IS_ERR(acdev->clk)) + clk_put(acdev->clk); return 0; }