Skip to content

Commit

Permalink
OMAP1/2/3 clock: remove paranoid checks in preparation for clock{,2xx…
Browse files Browse the repository at this point in the history
…x,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>
  • Loading branch information
Paul Walmsley authored and paul committed Dec 11, 2009
1 parent aa2cf42 commit ebd893d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 30 deletions.
6 changes: 0 additions & 6 deletions arch/arm/mach-omap1/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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++) {
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/mach-omap2/clock24xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand All @@ -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;
Expand Down
18 changes: 0 additions & 18 deletions arch/arm/mach-omap2/clock34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ebd893d

Please sign in to comment.