Commit ebd893de authored by Paul Walmsley's avatar Paul Walmsley Committed by paul

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: default avatarPaul Walmsley <paul@pwsan.com>
parent aa2cf420
...@@ -376,9 +376,6 @@ static int omap1_select_table_rate(struct clk * clk, unsigned long rate) ...@@ -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 */ /* Find the highest supported frequency <= rate and switch to it */
struct mpu_rate * ptr; struct mpu_rate * ptr;
if (clk != &virtual_ck_mpu)
return -EINVAL;
for (ptr = rate_table; ptr->rate; ptr++) { for (ptr = rate_table; ptr->rate; ptr++) {
if (ptr->xtal != ck_ref.rate) if (ptr->xtal != ck_ref.rate)
continue; continue;
...@@ -465,9 +462,6 @@ static long omap1_round_to_table_rate(struct clk * clk, unsigned long rate) ...@@ -465,9 +462,6 @@ static long omap1_round_to_table_rate(struct clk * clk, unsigned long rate)
struct mpu_rate * ptr; struct mpu_rate * ptr;
long highest_rate; long highest_rate;
if (clk != &virtual_ck_mpu)
return -EINVAL;
highest_rate = -EINVAL; highest_rate = -EINVAL;
for (ptr = rate_table; ptr->rate; ptr++) { for (ptr = rate_table; ptr->rate; ptr++) {
......
...@@ -512,9 +512,6 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate) ...@@ -512,9 +512,6 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)
struct prcm_config *ptr; struct prcm_config *ptr;
long highest_rate; long highest_rate;
if (clk != &virt_prcm_set)
return -EINVAL;
highest_rate = -EINVAL; highest_rate = -EINVAL;
for (ptr = rate_table; ptr->mpu_speed; ptr++) { for (ptr = rate_table; ptr->mpu_speed; ptr++) {
...@@ -540,9 +537,6 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate) ...@@ -540,9 +537,6 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate)
unsigned long found_speed = 0; unsigned long found_speed = 0;
unsigned long flags; unsigned long flags;
if (clk != &virt_prcm_set)
return -EINVAL;
for (prcm = rate_table; prcm->mpu_speed; prcm++) { for (prcm = rate_table; prcm->mpu_speed; prcm++) {
if (!(prcm->flags & cpu_mask)) if (!(prcm->flags & cpu_mask))
continue; continue;
......
...@@ -520,9 +520,6 @@ static int _omap3_noncore_dpll_lock(struct clk *clk) ...@@ -520,9 +520,6 @@ static int _omap3_noncore_dpll_lock(struct clk *clk)
u8 ai; u8 ai;
int r; int r;
if (clk == &dpll3_ck)
return -EINVAL;
pr_debug("clock: locking DPLL %s\n", clk->name); pr_debug("clock: locking DPLL %s\n", clk->name);
ai = omap3_dpll_autoidle_read(clk); ai = omap3_dpll_autoidle_read(clk);
...@@ -557,9 +554,6 @@ static int _omap3_noncore_dpll_bypass(struct clk *clk) ...@@ -557,9 +554,6 @@ static int _omap3_noncore_dpll_bypass(struct clk *clk)
int r; int r;
u8 ai; u8 ai;
if (clk == &dpll3_ck)
return -EINVAL;
if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS))) if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS)))
return -EINVAL; return -EINVAL;
...@@ -593,9 +587,6 @@ static int _omap3_noncore_dpll_stop(struct clk *clk) ...@@ -593,9 +587,6 @@ static int _omap3_noncore_dpll_stop(struct clk *clk)
{ {
u8 ai; u8 ai;
if (clk == &dpll3_ck)
return -EINVAL;
if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP))) if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP)))
return -EINVAL; return -EINVAL;
...@@ -632,9 +623,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk) ...@@ -632,9 +623,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
int r; int r;
struct dpll_data *dd; struct dpll_data *dd;
if (clk == &dpll3_ck)
return -EINVAL;
dd = clk->dpll_data; dd = clk->dpll_data;
if (!dd) if (!dd)
return -EINVAL; return -EINVAL;
...@@ -669,9 +657,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk) ...@@ -669,9 +657,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
*/ */
static void omap3_noncore_dpll_disable(struct clk *clk) static void omap3_noncore_dpll_disable(struct clk *clk)
{ {
if (clk == &dpll3_ck)
return;
_omap3_noncore_dpll_stop(clk); _omap3_noncore_dpll_stop(clk);
} }
...@@ -844,9 +829,6 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) ...@@ -844,9 +829,6 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)
if (!clk || !rate) if (!clk || !rate)
return -EINVAL; return -EINVAL;
if (clk != &dpll3_m2_ck)
return -EINVAL;
validrate = omap2_clksel_round_rate_div(clk, rate, &new_div); validrate = omap2_clksel_round_rate_div(clk, rate, &new_div);
if (validrate != rate) if (validrate != rate)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment