From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751241AbaEQWOk (ORCPT ); Sat, 17 May 2014 18:14:40 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:37607 "EHLO mail-ee0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbaEQWOj (ORCPT ); Sat, 17 May 2014 18:14:39 -0400 From: Peter Senna Tschudin To: Dominik Brodowski Cc: Peter Senna Tschudin , Thomas Renninger , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Alan Cox , kernel-janitors@vger.kernel.org, dan.carpenter@oracle.com Subject: [PATCH 2/4 V2] cpupower: Remove redundant error check Date: Sun, 18 May 2014 00:14:14 +0200 Message-Id: <1400364854-9575-1-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: // @@ expression E; identifier pr; expression list es; @@ for(...;...;...){ ... - if (E) break; + if (E){ + pr(es); + break; + } ... } - if(E) pr(es); // Untested. Signed-off-by: Peter Senna Tschudin --- Changes from V1: - Replaced break with a return - Return 0 instead of ret on success tools/power/cpupower/utils/cpufreq-set.c | 7 +++---- 1 file changed, 3 insertions(+), 4 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; }