From: Viresh Kumar <viresh.linux@gmail.com> 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 <viresh.kumar@st.com>, 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 [thread overview] Message-ID: <b65ce56f5c346b5f8230636a0c5da72662631bcd.1335008617.git.viresh.kumar@st.com> (raw) In-Reply-To: <cover.1335008617.git.viresh.kumar@st.com> In-Reply-To: <cover.1335008617.git.viresh.kumar@st.com> 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 <viresh.kumar@st.com> Cc: Jeff Garzik <jgarzik@redhat.com> 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; } -- 1.7.9
WARNING: multiple messages have this Message-ID (diff)
From: viresh.linux@gmail.com (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/13] ata/pata_arasan: Remove conditional compilation of clk code Date: Sat, 21 Apr 2012 17:17:31 +0530 [thread overview] Message-ID: <b65ce56f5c346b5f8230636a0c5da72662631bcd.1335008617.git.viresh.kumar@st.com> (raw) In-Reply-To: <cover.1335008617.git.viresh.kumar@st.com> 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 <viresh.kumar@st.com> Cc: Jeff Garzik <jgarzik@redhat.com> Cc: linux-ide at 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; } -- 1.7.9
next prev parent reply other threads:[~2012-04-21 11:47 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-21 11:47 [PATCH 00/13] clk: Add non CONFIG_HAVE_CLK routines Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 01/13] " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 12:42 ` Russell King - ARM Linux 2012-04-21 12:42 ` Russell King - ARM Linux 2012-04-21 13:47 ` viresh kumar 2012-04-21 13:47 ` viresh kumar 2012-04-21 11:47 ` [PATCH 02/13] clk: Remove redundant depends on from drivers/Kconfig Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 03/13] clk: CLK_PREPARE must depend on HAVE_CLK Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 12:40 ` Russell King - ARM Linux 2012-04-21 12:40 ` Russell King - ARM Linux 2012-04-21 11:47 ` Viresh Kumar [this message] 2012-04-21 11:47 ` [PATCH 04/13] ata/pata_arasan: Remove conditional compilation of clk code Viresh Kumar 2012-04-21 11:47 ` [PATCH 05/13] ata/sata_mv: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 06/13] i2c/i2c-pxa: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 07/13] net/c_can: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 08/13] net/stmmac: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-24 5:56 ` Giuseppe CAVALLARO 2012-04-24 5:56 ` Giuseppe CAVALLARO 2012-04-24 5:57 ` Giuseppe CAVALLARO 2012-04-24 5:57 ` Giuseppe CAVALLARO 2012-04-24 5:57 ` Giuseppe CAVALLARO 2012-04-24 6:09 ` Viresh Kumar 2012-04-24 6:09 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 09/13] gadget/m66592: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 10/13] gadget/r8a66597: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 11/13] usb/host/r8a66597: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 12/13] usb/marvell: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 11:47 ` [PATCH 13/13] usb/musb: " Viresh Kumar 2012-04-21 11:47 ` Viresh Kumar 2012-04-21 13:48 ` [PATCH 00/13] clk: Add non CONFIG_HAVE_CLK routines viresh kumar 2012-04-21 13:48 ` viresh kumar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b65ce56f5c346b5f8230636a0c5da72662631bcd.1335008617.git.viresh.kumar@st.com \ --to=viresh.linux@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=jgarzik@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mturquette@linaro.org \ --cc=spear-devel@list.st.com \ --cc=sshtylyov@mvista.com \ --cc=viresh.kumar@st.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.