diff options
author | Jonghwan Choi <jhbird.choi@samsung.com> | 2012-12-23 18:51:40 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-12-23 18:51:40 -0500 |
commit | 184cddd1e004d3ebd473f9e1ce20dec1d2576fd1 (patch) | |
tree | 8a10c414e869e4d79f100dc4b5ee055c802320d0 /drivers/cpufreq | |
parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) |
cpufreq: exynos: Remove unused variable & IS_ERR
The variable 'max_support_idx, min_support_idx, pm_lock_idx"
are never used, so remove the unused variable.
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/exynos-cpufreq.c | 3 | ||||
-rw-r--r-- | drivers/cpufreq/exynos4210-cpufreq.c | 15 | ||||
-rw-r--r-- | drivers/cpufreq/exynos4x12-cpufreq.c | 8 | ||||
-rw-r--r-- | drivers/cpufreq/exynos5250-cpufreq.c | 8 |
4 files changed, 4 insertions, 30 deletions
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c index 7012ea8bf1e7..0e415e5fb53b 100644 --- a/drivers/cpufreq/exynos-cpufreq.c +++ b/drivers/cpufreq/exynos-cpufreq.c | |||
@@ -299,8 +299,7 @@ static int __init exynos_cpufreq_init(void) | |||
299 | err_cpufreq: | 299 | err_cpufreq: |
300 | unregister_pm_notifier(&exynos_cpufreq_nb); | 300 | unregister_pm_notifier(&exynos_cpufreq_nb); |
301 | 301 | ||
302 | if (!IS_ERR(arm_regulator)) | 302 | regulator_put(arm_regulator); |
303 | regulator_put(arm_regulator); | ||
304 | err_vdd_arm: | 303 | err_vdd_arm: |
305 | kfree(exynos_info); | 304 | kfree(exynos_info); |
306 | pr_debug("%s: failed initialization\n", __func__); | 305 | pr_debug("%s: failed initialization\n", __func__); |
diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c index fb148fa27678..5ae5c529fca7 100644 --- a/drivers/cpufreq/exynos4210-cpufreq.c +++ b/drivers/cpufreq/exynos4210-cpufreq.c | |||
@@ -22,9 +22,6 @@ | |||
22 | 22 | ||
23 | #define CPUFREQ_LEVEL_END L5 | 23 | #define CPUFREQ_LEVEL_END L5 |
24 | 24 | ||
25 | static int max_support_idx = L0; | ||
26 | static int min_support_idx = (CPUFREQ_LEVEL_END - 1); | ||
27 | |||
28 | static struct clk *cpu_clk; | 25 | static struct clk *cpu_clk; |
29 | static struct clk *moutcore; | 26 | static struct clk *moutcore; |
30 | static struct clk *mout_mpll; | 27 | static struct clk *mout_mpll; |
@@ -276,10 +273,7 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info) | |||
276 | } | 273 | } |
277 | 274 | ||
278 | info->mpll_freq_khz = rate; | 275 | info->mpll_freq_khz = rate; |
279 | info->pm_lock_idx = L2; | ||
280 | info->pll_safe_idx = L2; | 276 | info->pll_safe_idx = L2; |
281 | info->max_support_idx = max_support_idx; | ||
282 | info->min_support_idx = min_support_idx; | ||
283 | info->cpu_clk = cpu_clk; | 277 | info->cpu_clk = cpu_clk; |
284 | info->volt_table = exynos4210_volt_table; | 278 | info->volt_table = exynos4210_volt_table; |
285 | info->freq_table = exynos4210_freq_table; | 279 | info->freq_table = exynos4210_freq_table; |
@@ -289,14 +283,11 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info) | |||
289 | return 0; | 283 | return 0; |
290 | 284 | ||
291 | err_mout_apll: | 285 | err_mout_apll: |
292 | if (!IS_ERR(mout_mpll)) | 286 | clk_put(mout_mpll); |
293 | clk_put(mout_mpll); | ||
294 | err_mout_mpll: | 287 | err_mout_mpll: |
295 | if (!IS_ERR(moutcore)) | 288 | clk_put(moutcore); |
296 | clk_put(moutcore); | ||
297 | err_moutcore: | 289 | err_moutcore: |
298 | if (!IS_ERR(cpu_clk)) | 290 | clk_put(cpu_clk); |
299 | clk_put(cpu_clk); | ||
300 | 291 | ||
301 | pr_debug("%s: failed initialization\n", __func__); | 292 | pr_debug("%s: failed initialization\n", __func__); |
302 | return -EINVAL; | 293 | return -EINVAL; |
diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c index 8c5a7afa5b0b..29b41ab072f5 100644 --- a/drivers/cpufreq/exynos4x12-cpufreq.c +++ b/drivers/cpufreq/exynos4x12-cpufreq.c | |||
@@ -22,9 +22,6 @@ | |||
22 | 22 | ||
23 | #define CPUFREQ_LEVEL_END (L13 + 1) | 23 | #define CPUFREQ_LEVEL_END (L13 + 1) |
24 | 24 | ||
25 | static int max_support_idx; | ||
26 | static int min_support_idx = (CPUFREQ_LEVEL_END - 1); | ||
27 | |||
28 | static struct clk *cpu_clk; | 25 | static struct clk *cpu_clk; |
29 | static struct clk *moutcore; | 26 | static struct clk *moutcore; |
30 | static struct clk *mout_mpll; | 27 | static struct clk *mout_mpll; |
@@ -420,8 +417,6 @@ static void __init set_volt_table(void) | |||
420 | { | 417 | { |
421 | unsigned int i; | 418 | unsigned int i; |
422 | 419 | ||
423 | max_support_idx = L1; | ||
424 | |||
425 | /* Not supported */ | 420 | /* Not supported */ |
426 | exynos4x12_freq_table[L0].frequency = CPUFREQ_ENTRY_INVALID; | 421 | exynos4x12_freq_table[L0].frequency = CPUFREQ_ENTRY_INVALID; |
427 | 422 | ||
@@ -511,10 +506,7 @@ int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info) | |||
511 | } | 506 | } |
512 | 507 | ||
513 | info->mpll_freq_khz = rate; | 508 | info->mpll_freq_khz = rate; |
514 | info->pm_lock_idx = L5; | ||
515 | info->pll_safe_idx = L7; | 509 | info->pll_safe_idx = L7; |
516 | info->max_support_idx = max_support_idx; | ||
517 | info->min_support_idx = min_support_idx; | ||
518 | info->cpu_clk = cpu_clk; | 510 | info->cpu_clk = cpu_clk; |
519 | info->volt_table = exynos4x12_volt_table; | 511 | info->volt_table = exynos4x12_volt_table; |
520 | info->freq_table = exynos4x12_freq_table; | 512 | info->freq_table = exynos4x12_freq_table; |
diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c index e64c253cb169..8a5d7338b795 100644 --- a/drivers/cpufreq/exynos5250-cpufreq.c +++ b/drivers/cpufreq/exynos5250-cpufreq.c | |||
@@ -23,8 +23,6 @@ | |||
23 | 23 | ||
24 | #define CPUFREQ_LEVEL_END (L15 + 1) | 24 | #define CPUFREQ_LEVEL_END (L15 + 1) |
25 | 25 | ||
26 | static int max_support_idx; | ||
27 | static int min_support_idx = (CPUFREQ_LEVEL_END - 1); | ||
28 | static struct clk *cpu_clk; | 26 | static struct clk *cpu_clk; |
29 | static struct clk *moutcore; | 27 | static struct clk *moutcore; |
30 | static struct clk *mout_mpll; | 28 | static struct clk *mout_mpll; |
@@ -249,8 +247,6 @@ static void __init set_volt_table(void) | |||
249 | { | 247 | { |
250 | unsigned int i; | 248 | unsigned int i; |
251 | 249 | ||
252 | max_support_idx = L0; | ||
253 | |||
254 | for (i = 0 ; i < CPUFREQ_LEVEL_END ; i++) | 250 | for (i = 0 ; i < CPUFREQ_LEVEL_END ; i++) |
255 | exynos5250_volt_table[i] = asv_voltage_5250[i]; | 251 | exynos5250_volt_table[i] = asv_voltage_5250[i]; |
256 | } | 252 | } |
@@ -313,12 +309,8 @@ int exynos5250_cpufreq_init(struct exynos_dvfs_info *info) | |||
313 | } | 309 | } |
314 | 310 | ||
315 | info->mpll_freq_khz = rate; | 311 | info->mpll_freq_khz = rate; |
316 | /* 1000Mhz */ | ||
317 | info->pm_lock_idx = L7; | ||
318 | /* 800Mhz */ | 312 | /* 800Mhz */ |
319 | info->pll_safe_idx = L9; | 313 | info->pll_safe_idx = L9; |
320 | info->max_support_idx = max_support_idx; | ||
321 | info->min_support_idx = min_support_idx; | ||
322 | info->cpu_clk = cpu_clk; | 314 | info->cpu_clk = cpu_clk; |
323 | info->volt_table = exynos5250_volt_table; | 315 | info->volt_table = exynos5250_volt_table; |
324 | info->freq_table = exynos5250_freq_table; | 316 | info->freq_table = exynos5250_freq_table; |