diff options
| -rw-r--r-- | arch/arm/mach-msm/clock-debug.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-msm/clock.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-msm/include/mach/clk.h | 6 |
3 files changed, 1 insertions, 26 deletions
diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c index 4886404d42f5..c4b34d7d26fb 100644 --- a/arch/arm/mach-msm/clock-debug.c +++ b/arch/arm/mach-msm/clock-debug.c | |||
| @@ -25,14 +25,7 @@ static int clock_debug_rate_set(void *data, u64 val) | |||
| 25 | struct clk *clock = data; | 25 | struct clk *clock = data; |
| 26 | int ret; | 26 | int ret; |
| 27 | 27 | ||
| 28 | /* Only increases to max rate will succeed, but that's actually good | 28 | ret = clk_set_rate(clock, val); |
| 29 | * for debugging purposes so we don't check for error. */ | ||
| 30 | if (clock->flags & CLK_MAX) | ||
| 31 | clk_set_max_rate(clock, val); | ||
| 32 | if (clock->flags & CLK_MIN) | ||
| 33 | ret = clk_set_min_rate(clock, val); | ||
| 34 | else | ||
| 35 | ret = clk_set_rate(clock, val); | ||
| 36 | if (ret != 0) | 29 | if (ret != 0) |
| 37 | printk(KERN_ERR "clk_set%s_rate failed (%d)\n", | 30 | printk(KERN_ERR "clk_set%s_rate failed (%d)\n", |
| 38 | (clock->flags & CLK_MIN) ? "_min" : "", ret); | 31 | (clock->flags & CLK_MIN) ? "_min" : "", ret); |
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c index 5fac2dfae980..8d07b256d8ea 100644 --- a/arch/arm/mach-msm/clock.c +++ b/arch/arm/mach-msm/clock.c | |||
| @@ -97,18 +97,6 @@ long clk_round_rate(struct clk *clk, unsigned long rate) | |||
| 97 | } | 97 | } |
| 98 | EXPORT_SYMBOL(clk_round_rate); | 98 | EXPORT_SYMBOL(clk_round_rate); |
| 99 | 99 | ||
| 100 | int clk_set_min_rate(struct clk *clk, unsigned long rate) | ||
| 101 | { | ||
| 102 | return clk->ops->set_min_rate(clk->id, rate); | ||
| 103 | } | ||
| 104 | EXPORT_SYMBOL(clk_set_min_rate); | ||
| 105 | |||
| 106 | int clk_set_max_rate(struct clk *clk, unsigned long rate) | ||
| 107 | { | ||
| 108 | return clk->ops->set_max_rate(clk->id, rate); | ||
| 109 | } | ||
| 110 | EXPORT_SYMBOL(clk_set_max_rate); | ||
| 111 | |||
| 112 | int clk_set_parent(struct clk *clk, struct clk *parent) | 100 | int clk_set_parent(struct clk *clk, struct clk *parent) |
| 113 | { | 101 | { |
| 114 | return -ENOSYS; | 102 | return -ENOSYS; |
diff --git a/arch/arm/mach-msm/include/mach/clk.h b/arch/arm/mach-msm/include/mach/clk.h index 5f1c37d4f223..fd4f4a7a83b3 100644 --- a/arch/arm/mach-msm/include/mach/clk.h +++ b/arch/arm/mach-msm/include/mach/clk.h | |||
| @@ -25,12 +25,6 @@ enum clk_reset_action { | |||
| 25 | 25 | ||
| 26 | struct clk; | 26 | struct clk; |
| 27 | 27 | ||
| 28 | /* Rate is minimum clock rate in Hz */ | ||
| 29 | int clk_set_min_rate(struct clk *clk, unsigned long rate); | ||
| 30 | |||
| 31 | /* Rate is maximum clock rate in Hz */ | ||
| 32 | int clk_set_max_rate(struct clk *clk, unsigned long rate); | ||
| 33 | |||
| 34 | /* Assert/Deassert reset to a hardware block associated with a clock */ | 28 | /* Assert/Deassert reset to a hardware block associated with a clock */ |
| 35 | int clk_reset(struct clk *clk, enum clk_reset_action action); | 29 | int clk_reset(struct clk *clk, enum clk_reset_action action); |
| 36 | 30 | ||
