arm: tegra: modify governor parameter set function

Use the parameter name and value to set to the conservative
governor.
Also defined the value of freq_step to be 3 and set it during
early suspension.

Bug 922351

Reviewed-on: http://git-master/r/73841

Change-Id: Ieefa487f8b255d4bf242a7d98b07dc3758a70e86
Signed-off-by: Wen Yi <wyi@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/77743
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

1 files changed, 17 insertions, 41 deletions

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 9d5b0819c9d0..b2ce3910931c 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -961,7 +961,7 @@ static void cpufreq_set_governor(char *governor)
 	struct file *scaling_gov = NULL;
 	mm_segment_t old_fs;
 	char    buf[128];
-	int i = 0;
+	int i;
 	loff_t offset = 0;
 
 	if (governor == NULL)
@@ -976,9 +976,7 @@ static void cpufreq_set_governor(char *governor)
 	{
 		sprintf(buf, cpufreq_sysfs_place_holder, i);
 		scaling_gov = filp_open(buf, O_RDWR, 0);
-		if (IS_ERR_OR_NULL(scaling_gov)) {
-			pr_err("%s. Can't open %s\n", __func__, buf);
-		} else {
+		if (scaling_gov != NULL) {
 			if (scaling_gov->f_op != NULL &&
 				scaling_gov->f_op->write != NULL)
 				scaling_gov->f_op->write(scaling_gov,
@@ -989,6 +987,8 @@ static void cpufreq_set_governor(char *governor)
 				pr_err("f_op might be null\n");
 
 			filp_close(scaling_gov, NULL);
+		} else {
+			pr_err("%s. Can't open %s\n", __func__, buf);
 		}
 	}
 	set_fs(old_fs);
@@ -1008,9 +1008,7 @@ void cpufreq_save_default_governor(void)
 	buf[127] = 0;
 	sprintf(buf, cpufreq_sysfs_place_holder,0);
 	scaling_gov = filp_open(buf, O_RDONLY, 0);
-	if (IS_ERR_OR_NULL(scaling_gov)) {
-		pr_err("%s. Can't open %s\n", __func__, buf);
-	} else {
+	if (scaling_gov != NULL) {
 		if (scaling_gov->f_op != NULL &&
 			scaling_gov->f_op->read != NULL)
 			scaling_gov->f_op->read(scaling_gov,
@@ -1021,6 +1019,8 @@ void cpufreq_save_default_governor(void)
 			pr_err("f_op might be null\n");
 
 		filp_close(scaling_gov, NULL);
+	} else {
+		pr_err("%s. Can't open %s\n", __func__, buf);
 	}
 	set_fs(old_fs);
 }
@@ -1030,57 +1030,33 @@ void cpufreq_restore_default_governor(void)
 	cpufreq_set_governor(cpufreq_gov_default);
 }
 
-void cpufreq_set_conservative_governor_param(int up_th, int down_th)
+void cpufreq_set_conservative_governor_param(char *name, int value)
 {
 	struct file *gov_param = NULL;
-	static char buf[128],parm[8];
-	loff_t offset = 0;
 	mm_segment_t old_fs;
-
-	if (up_th <= down_th) {
-		printk(KERN_ERR "%s: up_th(%d) is lesser than down_th(%d)\n",
-			__func__, up_th, down_th);
-		return;
-	}
+	static char buf[128], param_value[8];
+	loff_t offset = 0;
 
 	/* change to KERNEL_DS address limit */
 	old_fs = get_fs();
 	set_fs(KERNEL_DS);
 
-	sprintf(parm, "%d", up_th);
-	sprintf(buf, cpufreq_gov_conservative_param ,"up_threshold");
-	gov_param = filp_open(buf, O_RDONLY, 0);
-	if (IS_ERR_OR_NULL(gov_param)) {
-		pr_err("%s. Can't open %s\n", __func__, buf);
-	} else {
+	sprintf(param_value, "%d", value);
+	sprintf(buf, cpufreq_gov_conservative_param, name);
+	gov_param = filp_open(buf, O_RDWR, 0);
+	if (gov_param != NULL) {
 		if (gov_param->f_op != NULL &&
 			gov_param->f_op->write != NULL)
 			gov_param->f_op->write(gov_param,
-					parm,
-					strlen(parm),
+					param_value,
+					strlen(param_value),
 					&offset);
 		else
 			pr_err("f_op might be null\n");
 
 		filp_close(gov_param, NULL);
-	}
-
-	sprintf(parm, "%d", down_th);
-	sprintf(buf, cpufreq_gov_conservative_param ,"down_threshold");
-	gov_param = filp_open(buf, O_RDONLY, 0);
-	if (IS_ERR_OR_NULL(gov_param)) {
-		pr_err("%s. Can't open %s\n", __func__, buf);
 	} else {
-		if (gov_param->f_op != NULL &&
-			gov_param->f_op->write != NULL)
-			gov_param->f_op->write(gov_param,
-					parm,
-					strlen(parm),
-					&offset);
-		else
-			pr_err("f_op might be null\n");
-
-		filp_close(gov_param, NULL);
+		pr_err("%s. Can't open %s\n", __func__, buf);
 	}
 	set_fs(old_fs);
 }