[PATCH 3/4] cpupower: Remove redundant error check

From: Thomas Renninger <trenn@suse.de>
To: rjw@rjwysocki.net
Cc: linux-pm@vger.kernel.org, Peter Senna Tschudin <peter.senna@gmail.com>
Subject: [PATCH 3/4] cpupower: Remove redundant error check
Date: Tue, 22 Jul 2014 16:06:00 +0200	[thread overview]
Message-ID: <1406037961-27190-4-git-send-email-trenn@suse.de> (raw)
In-Reply-To: <1406037961-27190-1-git-send-email-trenn@suse.de>

From: Peter Senna Tschudin <peter.senna@gmail.com>

Remove double checks, and move the call to print_error to the
first check. Replace break by return, and return 0 on success.
The simplified version of the coccinelle semantic patch that
fixes this issue is as follows:

// <smpl>
@@
expression E; identifier pr; expression list es;
@@
for(...;...;...){
...
-	if (E) break;
+	if (E){
+		pr(es);
+		break;
+	}
...
}
- if(E) pr(es);
// </smpl>

Untested.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
 tools/power/cpupower/utils/cpufreq-set.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c
index a416de8..f656e58 100644
--- a/tools/power/cpupower/utils/cpufreq-set.c
+++ b/tools/power/cpupower/utils/cpufreq-set.c
@@ -320,12 +320,11 @@ int cmd_freq_set(int argc, char **argv)
 
 		printf(_("Setting cpu: %d\n"), cpu);
 		ret = do_one_cpu(cpu, &new_pol, freq, policychange);
-		if (ret)
-			break;
+		if (ret) {
+			print_error();
+			return ret;
+		}
 	}
 
-	if (ret)
-		print_error();
-
-	return ret;
+	return 0;
 }
-- 
1.7.6.1

