korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb/host/r8a66597: remove conditional compilation of clk code

Browse Source 
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: Russell King <rmk@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: viresh kumar <viresh.linux@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Viresh Kumar 2012-07-30 14:39:49 -07:00 committed by Linus Torvalds
parent 569a50da7f
commit c311b78b2a
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/host/r8a66597-hcd.c
View File

@ -95,9 +95,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
int i = 0; int i = 0;
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip) {
#ifdef CONFIG_HAVE_CLK
clk_enable(r8a66597->clk); clk_enable(r8a66597->clk);
#endif
do { do {
r8a66597_write(r8a66597, SCKE, SYSCFG0); r8a66597_write(r8a66597, SCKE, SYSCFG0);
tmp = r8a66597_read(r8a66597, SYSCFG0); tmp = r8a66597_read(r8a66597, SYSCFG0);
@ -141,9 +139,7 @@ static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
udelay(1); udelay(1);
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip) {
#ifdef CONFIG_HAVE_CLK
clk_disable(r8a66597->clk); clk_disable(r8a66597->clk);
#endif
} else { } else {
r8a66597_bclr(r8a66597, PLLC, SYSCFG0); r8a66597_bclr(r8a66597, PLLC, SYSCFG0);
r8a66597_bclr(r8a66597, XCKE, SYSCFG0); r8a66597_bclr(r8a66597, XCKE, SYSCFG0);
@ -2406,19 +2402,15 @@ static int __devexit r8a66597_remove(struct platform_device *pdev)
del_timer_sync(&r8a66597->rh_timer); del_timer_sync(&r8a66597->rh_timer);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
iounmap(r8a66597->reg); iounmap(r8a66597->reg);
#ifdef CONFIG_HAVE_CLK
if (r8a66597->pdata->on_chip) if (r8a66597->pdata->on_chip)
clk_put(r8a66597->clk); clk_put(r8a66597->clk);
#endif
usb_put_hcd(hcd); usb_put_hcd(hcd);
return 0; return 0;
} }
static int __devinit r8a66597_probe(struct platform_device *pdev) static int __devinit r8a66597_probe(struct platform_device *pdev)
{ {
#ifdef CONFIG_HAVE_CLK
char clk_name[8]; char clk_name[8];
#endif
struct resource *res = NULL, *ires; struct resource *res = NULL, *ires;
int irq = -1; int irq = -1;
void __iomem *reg = NULL; void __iomem *reg = NULL;
@ -2482,7 +2474,6 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW; r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip) {
#ifdef CONFIG_HAVE_CLK
snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id); snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
r8a66597->clk = clk_get(&pdev->dev, clk_name); r8a66597->clk = clk_get(&pdev->dev, clk_name);
if (IS_ERR(r8a66597->clk)) { if (IS_ERR(r8a66597->clk)) {
@ -2491,7 +2482,6 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
ret = PTR_ERR(r8a66597->clk); ret = PTR_ERR(r8a66597->clk);
goto clean_up2; goto clean_up2;
} }
#endif
r8a66597->max_root_hub = 1; r8a66597->max_root_hub = 1;
} else } else
r8a66597->max_root_hub = 2; r8a66597->max_root_hub = 2;
@ -2531,11 +2521,9 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
return 0; return 0;
clean_up3: clean_up3:
#ifdef CONFIG_HAVE_CLK
if (r8a66597->pdata->on_chip) if (r8a66597->pdata->on_chip)
clk_put(r8a66597->clk); clk_put(r8a66597->clk);
clean_up2: clean_up2:
#endif
usb_put_hcd(hcd); usb_put_hcd(hcd);
clean_up: clean_up:

5
drivers/usb/host/r8a66597.h
View File

@ -26,10 +26,7 @@
#ifndef __R8A66597_H__ #ifndef __R8A66597_H__
#define __R8A66597_H__ #define __R8A66597_H__
#ifdef CONFIG_HAVE_CLK
#include <linux/clk.h> #include <linux/clk.h>
#endif
#include <linux/usb/r8a66597.h> #include <linux/usb/r8a66597.h>
#define R8A66597_MAX_NUM_PIPE 10 #define R8A66597_MAX_NUM_PIPE 10
@ -113,9 +110,7 @@ struct r8a66597_root_hub {
struct r8a66597 { struct r8a66597 {
spinlock_t lock; spinlock_t lock;
void __iomem *reg; void __iomem *reg;
#ifdef CONFIG_HAVE_CLK
struct clk *clk; struct clk *clk;
#endif
struct r8a66597_platdata *pdata; struct r8a66597_platdata *pdata;
struct r8a66597_device device0; struct r8a66597_device device0;
struct r8a66597_root_hub root_hub[R8A66597_MAX_ROOT_HUB]; struct r8a66597_root_hub root_hub[R8A66597_MAX_ROOT_HUB];