Browse Source

ARM: EXYNOS4: Remove meaningless REGULATOR config option

The regulator API ifdefs itself out when not enabled
so there is no need for users to do this.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: edited description]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Kyungmin Park 14 years ago
parent
commit
f36871b044
1 changed files with 0 additions and 10 deletions
  1. 0 10
      arch/arm/mach-exynos4/cpufreq.c

+ 0 - 10
arch/arm/mach-exynos4/cpufreq.c

@@ -31,10 +31,8 @@ static struct clk *moutcore;
 static struct clk *mout_mpll;
 static struct clk *mout_mpll;
 static struct clk *mout_apll;
 static struct clk *mout_apll;
 
 
-#ifdef CONFIG_REGULATOR
 static struct regulator *arm_regulator;
 static struct regulator *arm_regulator;
 static struct regulator *int_regulator;
 static struct regulator *int_regulator;
-#endif
 
 
 static struct cpufreq_freqs freqs;
 static struct cpufreq_freqs freqs;
 static unsigned int memtype;
 static unsigned int memtype;
@@ -434,10 +432,8 @@ static int exynos4_target(struct cpufreq_policy *policy,
 	/* control regulator */
 	/* control regulator */
 	if (freqs.new > freqs.old) {
 	if (freqs.new > freqs.old) {
 		/* Voltage up */
 		/* Voltage up */
-#ifdef CONFIG_REGULATOR
 		regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
 		regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
 		regulator_set_voltage(int_regulator, int_volt, int_volt);
 		regulator_set_voltage(int_regulator, int_volt, int_volt);
-#endif
 	}
 	}
 
 
 	/* Clock Configuration Procedure */
 	/* Clock Configuration Procedure */
@@ -446,10 +442,8 @@ static int exynos4_target(struct cpufreq_policy *policy,
 	/* control regulator */
 	/* control regulator */
 	if (freqs.new < freqs.old) {
 	if (freqs.new < freqs.old) {
 		/* Voltage down */
 		/* Voltage down */
-#ifdef CONFIG_REGULATOR
 		regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
 		regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
 		regulator_set_voltage(int_regulator, int_volt, int_volt);
 		regulator_set_voltage(int_regulator, int_volt, int_volt);
-#endif
 	}
 	}
 
 
 	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
 	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
@@ -521,7 +515,6 @@ static int __init exynos4_cpufreq_init(void)
 	if (IS_ERR(mout_apll))
 	if (IS_ERR(mout_apll))
 		goto out;
 		goto out;
 
 
-#ifdef CONFIG_REGULATOR
 	arm_regulator = regulator_get(NULL, "vdd_arm");
 	arm_regulator = regulator_get(NULL, "vdd_arm");
 	if (IS_ERR(arm_regulator)) {
 	if (IS_ERR(arm_regulator)) {
 		printk(KERN_ERR "failed to get resource %s\n", "vdd_arm");
 		printk(KERN_ERR "failed to get resource %s\n", "vdd_arm");
@@ -533,7 +526,6 @@ static int __init exynos4_cpufreq_init(void)
 		printk(KERN_ERR "failed to get resource %s\n", "vdd_int");
 		printk(KERN_ERR "failed to get resource %s\n", "vdd_int");
 		goto out;
 		goto out;
 	}
 	}
-#endif
 
 
 	/*
 	/*
 	 * Check DRAM type.
 	 * Check DRAM type.
@@ -565,13 +557,11 @@ out:
 	if (!IS_ERR(mout_apll))
 	if (!IS_ERR(mout_apll))
 		clk_put(mout_apll);
 		clk_put(mout_apll);
 
 
-#ifdef CONFIG_REGULATOR
 	if (!IS_ERR(arm_regulator))
 	if (!IS_ERR(arm_regulator))
 		regulator_put(arm_regulator);
 		regulator_put(arm_regulator);
 
 
 	if (!IS_ERR(int_regulator))
 	if (!IS_ERR(int_regulator))
 		regulator_put(int_regulator);
 		regulator_put(int_regulator);
-#endif
 
 
 	printk(KERN_ERR "%s: failed initialization\n", __func__);
 	printk(KERN_ERR "%s: failed initialization\n", __func__);