diff options
| author |   Oskar Schirmer <oskar@linutronix.de> | 2011-02-17 16:43:01 +0100 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2011-03-11 10:06:06 +0100 |
| commit | cfeeb2f99867c075f3a1a6ac59c0a42e1cd741b0 (patch) | |
| tree | 39628caef162160d023c08e3efd1180f62dcfe80 /arch/arm/mach-tcc8k | |
| parent | arm: tcc8k: Avoid reading clock register twice (diff) | |
| download | linux-dev-cfeeb2f99867c075f3a1a6ac59c0a42e1cd741b0.tar.xz linux-dev-cfeeb2f99867c075f3a1a6ac59c0a42e1cd741b0.zip | |
arm: tcc8k: Fix indent, coding syle
Remove double definition of ACLKUSBH, change parameter name in
root_clk_disable, as there is no reason to have a different name than
in root_clk_enable.
No functional change.
Signed-off-by: Oskar Schirmer <oskar@linutronix.de>
Cc: bigeasy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-tcc8k')
| -rw-r--r-- | arch/arm/mach-tcc8k/clock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-tcc8k/clock.c b/arch/arm/mach-tcc8k/clock.c index a25e3fcb716f..8d8c99f89558 100644 --- a/arch/arm/mach-tcc8k/clock.c +++ b/arch/arm/mach-tcc8k/clock.c @@ -45,7 +45,6 @@ #define ACLKGSB1 (CKC_BASE + ACLKGSB1_OFFS) #define ACLKGSB2 (CKC_BASE + ACLKGSB2_OFFS) #define ACLKGSB3 (CKC_BASE + ACLKGSB3_OFFS) -#define ACLKUSBH (CKC_BASE + ACLKUSBH_OFFS) #define ACLKTCT (CKC_BASE + ACLKTCT_OFFS) #define ACLKTCX (CKC_BASE + ACLKTCX_OFFS) #define ACLKTCZ (CKC_BASE + ACLKTCZ_OFFS) @@ -108,9 +107,9 @@ static int root_clk_enable(enum root_clks src) return 0; } -static int root_clk_disable(enum root_clks root_src) +static int root_clk_disable(enum root_clks src) { - switch (root_src) { + switch (src) { case CLK_SRC_PLL0: return pll_enable(0, 0); case CLK_SRC_PLL1: return pll_enable(1, 0); case CLK_SRC_PLL2: return pll_enable(2, 0); @@ -304,7 +303,7 @@ static unsigned long get_rate_sys(struct clk *clk) unsigned int src; src = __raw_readl(CKC_BASE + CLKCTRL_OFFS) & CLK_SRC_MASK; - return root_clk_get_rate(src); + return root_clk_get_rate(src); } static unsigned long get_rate_bus(struct clk *clk) |