From patchwork Sat Apr 21 11:47:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: viresh kumar X-Patchwork-Id: 154207 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 C322EB6FA3 for ; Sat, 21 Apr 2012 21:51:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751782Ab2DULvJ (ORCPT ); Sat, 21 Apr 2012 07:51:09 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:35714 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751567Ab2DULvI (ORCPT ); Sat, 21 Apr 2012 07:51:08 -0400 Received: by pbcun15 with SMTP id un15so2048492pbc.19 for ; Sat, 21 Apr 2012 04:51: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=Zhg6Q/vmhUzJM7q4KlYIUMvRzDDGAZuPMUx9KmJ0ItE=; b=ldvhWuKA4zVtrg712oR1GZAlCMIy9x9nb7zS/jkvMCClB9ZVFCp+OResC/mBPziivo dkqVSoTL1xAJnWWCE6B37Sa0zE+pwP0JduD2Yd5lHk8AB9rh9Ifhag605jeloJVnw1xu HT3IrhBad7FHJtJy/mYncWhQJZUKJ75brT6cI9F/TA6SYhZUehY32vnv8flVsiK7gqw6 abEaip00LdC0Ruc8V7N6tghEu7onnVDUquUkI73uLSHcbyPejeKH1iZRJ0S4KCBRgKPD TptNQYOJ0IwelWFThma0UXTqRgxM2/qhOI1UEVingWaRnRaRWQ6PRDNOlbXwbmEzqUvM elyg== Received: by 10.68.223.105 with SMTP id qt9mr2927030pbc.162.1335009068098; Sat, 21 Apr 2012 04:51:08 -0700 (PDT) Received: from localhost ([223.226.85.135]) by mx.google.com with ESMTPS id tp6sm144725pbc.52.2012.04.21.04.50.33 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 21 Apr 2012 04:51:06 -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 05/13] ata/sata_mv: Remove conditional compilation of clk code Date: Sat, 21 Apr 2012 17:17:32 +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/sata_mv.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 38950ea..3bb9cb7 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -551,9 +551,7 @@ struct mv_host_priv { u32 irq_mask_offset; u32 unmask_all_irqs; -#if defined(CONFIG_HAVE_CLK) struct clk *clk; -#endif /* * These consistent DMA memory pools give us guaranteed * alignment for hardware-accessed data structures, @@ -4062,13 +4060,11 @@ static int mv_platform_probe(struct platform_device *pdev) resource_size(res)); hpriv->base -= SATAHC0_REG_BASE; -#if defined(CONFIG_HAVE_CLK) hpriv->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(hpriv->clk)) dev_notice(&pdev->dev, "cannot get clkdev\n"); else clk_enable(hpriv->clk); -#endif /* * (Re-)program MBUS remapping windows if we are asked to. @@ -4095,12 +4091,10 @@ static int mv_platform_probe(struct platform_device *pdev) return 0; err: -#if defined(CONFIG_HAVE_CLK) if (!IS_ERR(hpriv->clk)) { clk_disable(hpriv->clk); clk_put(hpriv->clk); } -#endif return rc; } @@ -4116,17 +4110,13 @@ err: static int __devexit mv_platform_remove(struct platform_device *pdev) { struct ata_host *host = platform_get_drvdata(pdev); -#if defined(CONFIG_HAVE_CLK) struct mv_host_priv *hpriv = host->private_data; -#endif ata_host_detach(host); -#if defined(CONFIG_HAVE_CLK) if (!IS_ERR(hpriv->clk)) { clk_disable(hpriv->clk); clk_put(hpriv->clk); } -#endif return 0; }