From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757638AbbCEQNX (ORCPT ); Thu, 5 Mar 2015 11:13:23 -0500 Received: from smtprelay0232.hostedemail.com ([216.40.44.232]:56102 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757416AbbCEQNW (ORCPT ); Thu, 5 Mar 2015 11:13:22 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::,RULES_HIT:41:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:4321:5007:6261:10004:10400:10848:11232:11473:11658:11914:12043:12438:12517:12519:12555:12740:13019:13161:13229:14096:14097:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: magic29_9140dac70f50c X-Filterd-Recvd-Size: 3159 Message-ID: <1425571997.31859.4.camel@perches.com> Subject: Re: [PATCH 1/2] bq2415x_charger: Remove unnecessary else after return From: Joe Perches To: Anda-Maria Nicolae Cc: sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 05 Mar 2015 08:13:17 -0800 In-Reply-To: <1425554637-26782-2-git-send-email-anda-maria.nicolae@intel.com> References: <1425554637-26782-1-git-send-email-anda-maria.nicolae@intel.com> <1425554637-26782-2-git-send-email-anda-maria.nicolae@intel.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2015-03-05 at 13:23 +0200, Anda-Maria Nicolae wrote: > Fix coding style to comply with checkpatch.pl I think these are unnecessary changes. The current version of checkpatch should not emit a warning for the original code. > diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c [] > @@ -352,8 +352,7 @@ static int bq2415x_exec_command(struct bq2415x_device *bq, > BQ2415X_BIT_CE); > if (ret < 0) > return ret; > - else > - return ret > 0 ? 0 : 1; > + return ret > 0 ? 0 : 1; maybe return !ret > case BQ2415X_CHARGER_ENABLE: > return bq2415x_i2c_write_bit(bq, BQ2415X_REG_CONTROL, > 0, BQ2415X_BIT_CE); > @@ -426,20 +425,17 @@ static enum bq2415x_chip bq2415x_detect_chip(struct bq2415x_device *bq) > case 0: > if (bq->chip == BQ24151A) > return bq->chip; > - else > - return BQ24151; > + return BQ24151; > case 1: > if (bq->chip == BQ24150A || > bq->chip == BQ24152 || > bq->chip == BQ24155) > return bq->chip; > - else > - return BQ24150; > + return BQ24150; > case 2: > if (bq->chip == BQ24153A) > return bq->chip; > - else > - return BQ24153; > + return BQ24153; > default: > return BQUNKNOWN; > } > @@ -450,8 +446,7 @@ static enum bq2415x_chip bq2415x_detect_chip(struct bq2415x_device *bq) > case 0: > if (bq->chip == BQ24156A) > return bq->chip; > - else > - return BQ24156; > + return BQ24156; > case 2: > return BQ24158; > default: > @@ -480,8 +475,7 @@ static int bq2415x_detect_revision(struct bq2415x_device *bq) > case BQ24152: > if (ret >= 0 && ret <= 3) > return ret; > - else > - return -1; > + return -1; > case BQ24153: > case BQ24153A: > case BQ24156: > @@ -491,13 +485,11 @@ static int bq2415x_detect_revision(struct bq2415x_device *bq) > return 0; > else if (ret == 1) > return 1; > - else > - return -1; > + return -1; > case BQ24155: > if (ret == 3) > return 3; > - else > - return -1; > + return -1; > case BQUNKNOWN: > return -1; > }