aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-12-08 16:18:44 -0700
committerpaul <paul@twilight.(none)>2009-12-11 16:12:07 -0700
commitebd893ded2733b8bd9ba403ee4a9e6ab6fbc2a54 (patch)
treec8c31ef40c271421ddebe16c5f513a97268d503e /arch
parentaa2cf420593b67cc93de7a3f675b2a88eba0505f (diff)
OMAP1/2/3 clock: remove paranoid checks in preparation for clock{,2xxx,3xxx}_data.c
Some parts of the clock code took advantage of the fact that the statically allocated clock tree was in clock{,24xx,34xx}.c's local namespace to do some extra argument checks. These are overzealous and are more difficult to maintain when the clock tree is in a separate namespace, so, remove them. Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/clock.c6
-rw-r--r--arch/arm/mach-omap2/clock24xx.c6
-rw-r--r--arch/arm/mach-omap2/clock34xx.c18
3 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 42cbe203da3..e006493fe6e 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -376,9 +376,6 @@ static int omap1_select_table_rate(struct clk * clk, unsigned long rate)
/* Find the highest supported frequency <= rate and switch to it */
struct mpu_rate * ptr;
- if (clk != &virtual_ck_mpu)
- return -EINVAL;
-
for (ptr = rate_table; ptr->rate; ptr++) {
if (ptr->xtal != ck_ref.rate)
continue;
@@ -465,9 +462,6 @@ static long omap1_round_to_table_rate(struct clk * clk, unsigned long rate)
struct mpu_rate * ptr;
long highest_rate;
- if (clk != &virtual_ck_mpu)
- return -EINVAL;
-
highest_rate = -EINVAL;
for (ptr = rate_table; ptr->rate; ptr++) {
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 845b478ebee..8ecd1751a3d 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -512,9 +512,6 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)
struct prcm_config *ptr;
long highest_rate;
- if (clk != &virt_prcm_set)
- return -EINVAL;
-
highest_rate = -EINVAL;
for (ptr = rate_table; ptr->mpu_speed; ptr++) {
@@ -540,9 +537,6 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate)
unsigned long found_speed = 0;
unsigned long flags;
- if (clk != &virt_prcm_set)
- return -EINVAL;
-
for (prcm = rate_table; prcm->mpu_speed; prcm++) {
if (!(prcm->flags & cpu_mask))
continue;
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index ecbb5cd8eec..523978a58d4 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -520,9 +520,6 @@ static int _omap3_noncore_dpll_lock(struct clk *clk)
u8 ai;
int r;
- if (clk == &dpll3_ck)
- return -EINVAL;
-
pr_debug("clock: locking DPLL %s\n", clk->name);
ai = omap3_dpll_autoidle_read(clk);
@@ -557,9 +554,6 @@ static int _omap3_noncore_dpll_bypass(struct clk *clk)
int r;
u8 ai;
- if (clk == &dpll3_ck)
- return -EINVAL;
-
if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS)))
return -EINVAL;
@@ -593,9 +587,6 @@ static int _omap3_noncore_dpll_stop(struct clk *clk)
{
u8 ai;
- if (clk == &dpll3_ck)
- return -EINVAL;
-
if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP)))
return -EINVAL;
@@ -632,9 +623,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
int r;
struct dpll_data *dd;
- if (clk == &dpll3_ck)
- return -EINVAL;
-
dd = clk->dpll_data;
if (!dd)
return -EINVAL;
@@ -669,9 +657,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
*/
static void omap3_noncore_dpll_disable(struct clk *clk)
{
- if (clk == &dpll3_ck)
- return;
-
_omap3_noncore_dpll_stop(clk);
}
@@ -844,9 +829,6 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)
if (!clk || !rate)
return -EINVAL;
- if (clk != &dpll3_m2_ck)
- return -EINVAL;
-
validrate = omap2_clksel_round_rate_div(clk, rate, &new_div);
if (validrate != rate)
return -EINVAL;