From: Viresh Kumar <viresh.kumar@st.com>
To: <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <mturquette@linaro.org>,
<sshtylyov@mvista.com>, <jgarzik@redhat.com>,
<linux@arm.linux.org.uk>, <spear-devel@list.st.com>,
<viresh.linux@gmail.com>, Viresh Kumar <viresh.kumar@st.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-usb@vger.kernel.org>
Subject: [PATCH V2 8/9] gadget/r8a66597: Remove conditional compilation of clk code
Date: Tue, 24 Apr 2012 11:26:16 +0530 [thread overview]
Message-ID: <6db56e071d4862de74887de6c695d2f4fa72ffa9.1335246730.git.viresh.kumar@st.com> (raw)
In-Reply-To: <cover.1335246730.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
---
drivers/usb/gadget/r8a66597-udc.c | 21 +++++++--------------
drivers/usb/gadget/r8a66597-udc.h | 5 -----
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index c4401e7..85aa56d 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1818,12 +1818,11 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
iounmap(r8a66597->sudmac_reg);
free_irq(platform_get_irq(pdev, 0), r8a66597);
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
-#ifdef CONFIG_HAVE_CLK
- if (r8a66597->pdata->on_chip) {
+
+ if (r8a66597->pdata->on_chip && !IS_ERR(r8a66597->clk)) {
clk_disable(r8a66597->clk);
clk_put(r8a66597->clk);
}
-#endif
device_unregister(&r8a66597->gadget.dev);
kfree(r8a66597);
return 0;
@@ -1855,9 +1854,7 @@ static int __init r8a66597_sudmac_ioremap(struct r8a66597 *r8a66597,
static int __init r8a66597_probe(struct platform_device *pdev)
{
-#ifdef CONFIG_HAVE_CLK
char clk_name[8];
-#endif
struct resource *res, *ires;
int irq;
void __iomem *reg = NULL;
@@ -1921,19 +1918,17 @@ static int __init r8a66597_probe(struct platform_device *pdev)
r8a66597->timer.data = (unsigned long)r8a66597;
r8a66597->reg = reg;
-#ifdef CONFIG_HAVE_CLK
if (r8a66597->pdata->on_chip) {
snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
r8a66597->clk = clk_get(&pdev->dev, clk_name);
if (IS_ERR(r8a66597->clk)) {
dev_err(&pdev->dev, "cannot get clock \"%s\"\n",
clk_name);
- ret = PTR_ERR(r8a66597->clk);
- goto clean_up_dev;
+ } else {
+ clk_enable(r8a66597->clk);
}
- clk_enable(r8a66597->clk);
}
-#endif
+
if (r8a66597->pdata->sudmac) {
ret = r8a66597_sudmac_ioremap(r8a66597, pdev);
if (ret < 0)
@@ -1993,13 +1988,11 @@ err_add_udc:
clean_up3:
free_irq(irq, r8a66597);
clean_up2:
-#ifdef CONFIG_HAVE_CLK
- if (r8a66597->pdata->on_chip) {
+ if (r8a66597->pdata->on_chip && !IS_ERR(r8a66597->clk)) {
clk_disable(r8a66597->clk);
clk_put(r8a66597->clk);
}
-clean_up_dev:
-#endif
+
device_unregister(&r8a66597->gadget.dev);
clean_up:
if (r8a66597) {
diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
index 8e3de61..d2a5ad2 100644
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/r8a66597-udc.h
@@ -13,10 +13,7 @@
#ifndef __R8A66597_H__
#define __R8A66597_H__
-#ifdef CONFIG_HAVE_CLK
#include <linux/clk.h>
-#endif
-
#include <linux/usb/r8a66597.h>
#define R8A66597_MAX_SAMPLING 10
@@ -92,9 +89,7 @@ struct r8a66597 {
void __iomem *reg;
void __iomem *sudmac_reg;
-#ifdef CONFIG_HAVE_CLK
struct clk *clk;
-#endif
struct r8a66597_platdata *pdata;
struct usb_gadget gadget;
--
1.7.9
next prev parent reply other threads:[~2012-04-24 6:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 5:56 [PATCH V2 0/9] clk: Add non CONFIG_HAVE_CLK routines Viresh Kumar
2012-04-24 5:56 ` [PATCH V2 1/9] " Viresh Kumar
2012-04-24 5:56 ` [PATCH V2 2/9] clk: Remove redundant depends on from drivers/Kconfig Viresh Kumar
2012-04-24 5:56 ` [PATCH V2 3/9] ata/pata_arasan: Remove conditional compilation of clk code Viresh Kumar
2012-04-24 5:56 ` [PATCH V2 4/9] ata/sata_mv: " Viresh Kumar
2012-04-24 5:56 ` [PATCH V2 5/9] net/c_can: " Viresh Kumar
2012-04-24 5:56 ` [PATCH V2 6/9] net/stmmac: " Viresh Kumar
2012-04-24 6:16 ` Giuseppe CAVALLARO
2012-04-24 6:33 ` Giuseppe CAVALLARO
2012-04-24 6:42 ` Viresh Kumar
2012-04-24 8:24 ` Giuseppe CAVALLARO
2012-04-24 5:56 ` [PATCH V2 7/9] gadget/m66592: " Viresh Kumar
2012-04-24 5:56 ` Viresh Kumar [this message]
2012-04-24 5:56 ` [PATCH V2 9/9] usb/host/r8a66597: " 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=6db56e071d4862de74887de6c695d2f4fa72ffa9.1335246730.git.viresh.kumar@st.com \
--to=viresh.kumar@st.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=jgarzik@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mturquette@linaro.org \
--cc=spear-devel@list.st.com \
--cc=sshtylyov@mvista.com \
--cc=viresh.linux@gmail.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®