cpufreq: Fix checkpatch errors and warnings

PATCH In review Stratos Karafotis 2 participants 2 messages Mar 19, 2014 – Mar 20, 2014 CPU frequency scaling framework

Share & tools

Stratos Karafotis

author

2014-03-19 21:29 UTC #0 lore raw

PATCH 1/1 cpufreq: Fix checkpatch errors and warnings

Fix 2 checkpatch errors about using assignment in if condition, 1 checkpatch error about a required space after comma and 3 warnings about line over 80 characters.

Signed-off-by Stratos Karafotis <[email protected]>

---
 drivers/cpufreq/cpufreq.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

drivers/cpufreq/cpufreq.c +12 ~~-11~~

index e3aa9de..1eafd8c 100644
@@ -939,8 +939,10 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy,
 	up_write(&policy->rwsem);
 
 	if (has_target()) {
-		if ((ret = __cpufreq_governor(policy, CPUFREQ_GOV_START)) ||
-			(ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))) {
+		ret = __cpufreq_governor(policy, CPUFREQ_GOV_START);
+		if (!ret)
+			ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
+		if (ret) {
 			pr_err("%s: Failed to start governor\n", __func__);
 			return ret;
 		}

@@ -1394,14 +1396,13 @@ static int __cpufreq_remove_dev_finish(struct device *dev,
 
 		if (!cpufreq_suspended)
 			cpufreq_policy_free(policy);
-	} else {
-		if (has_target()) {
-			if ((ret = __cpufreq_governor(policy, CPUFREQ_GOV_START)) ||
-					(ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))) {
-				pr_err("%s: Failed to start governor\n",
-				       __func__);
-				return ret;
-			}
+	} else if (has_target()) {
+		ret = __cpufreq_governor(policy, CPUFREQ_GOV_START);
+		if (!ret)
+			ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
+		if (ret) {
+			pr_err("%s: Failed to start governor\n", __func__);
+			return ret;
 		}
 	}

@@ -2086,7 +2087,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,
 	if (old_gov) {
 		__cpufreq_governor(policy, CPUFREQ_GOV_STOP);
 		up_write(&policy->rwsem);
-		__cpufreq_governor(policy,CPUFREQ_GOV_POLICY_EXIT);
+		__cpufreq_governor(policy, CPUFREQ_GOV_POLICY_EXIT);
 		down_write(&policy->rwsem);
 	}

Signature · 1 line

1.8.5.3

Viresh Kumar

maintainer Acked-by on v1 1/1

2014-03-20 00:05 UTC #1 lore raw

Quoted 8 lines · Stratos Karafotis

Fix 2 checkpatch errors about using assignment in if condition, 1 checkpatch error about a required space after comma and 3 warnings about line over 80 characters.
Signed-off-by Stratos Karafotis <[email protected]>
---
 drivers/cpufreq/cpufreq.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Acked-by Viresh Kumar <[email protected]>