From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754839AbbE1Vcn (ORCPT ); Thu, 28 May 2015 17:32:43 -0400 Received: from smtprelay0058.hostedemail.com ([216.40.44.58]:55147 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754755AbbE1Vcj (ORCPT ); Thu, 28 May 2015 17:32:39 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3871:3874:4321:5007:6261:7576:10004:10400:10848:11026:11232:11473:11657:11658:11914:12043:12438:12517:12519:12679:12740:13069:13161:13229:13311:13357: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: stew76_6df7aad4b9402 X-Filterd-Recvd-Size: 2913 Message-ID: <1432848754.1556.25.camel@perches.com> Subject: Re: [PATCH 1/9] drivers/media/usb/airspy/airspy.c: drop unneeded goto From: Joe Perches To: Julia Lawall Cc: Antti Palosaari , kernel-janitors@vger.kernel.org, Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 28 May 2015 14:32:34 -0700 In-Reply-To: <1432846944-7122-2-git-send-email-Julia.Lawall@lip6.fr> References: <1432846944-7122-1-git-send-email-Julia.Lawall@lip6.fr> <1432846944-7122-2-git-send-email-Julia.Lawall@lip6.fr> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.11-0ubuntu3 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-05-28 at 23:02 +0200, Julia Lawall wrote: > From: Julia Lawall > > Delete jump to a label on the next line, when that label is not > used elsewhere. Seems sensible but: > diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c [] > @@ -937,9 +937,6 @@ static int airspy_set_if_gain(struct airspy *s) > ret = airspy_ctrl_msg(s, CMD_SET_VGA_GAIN, 0, s->if_gain->val, > &u8tmp, 1); > if (ret) > - goto err; > -err: > - if (ret) > dev_dbg(s->dev, "failed=%d\n", ret); > > return ret; Ideally the function above this should also be modified do drop the unnecessary double test of ret static int airspy_set_mixer_gain(struct airspy *s) { int ret; u8 u8tmp; dev_dbg(s->dev, "mixer auto=%d->%d val=%d->%d\n", s->mixer_gain_auto->cur.val, s->mixer_gain_auto->val, s->mixer_gain->cur.val, s->mixer_gain->val); ret = airspy_ctrl_msg(s, CMD_SET_MIXER_AGC, 0, s->mixer_gain_auto->val, &u8tmp, 1); if (ret) goto err; if (s->mixer_gain_auto->val == false) { ret = airspy_ctrl_msg(s, CMD_SET_MIXER_GAIN, 0, s->mixer_gain->val, &u8tmp, 1); if (ret) goto err; } err: if (ret) dev_dbg(s->dev, "failed=%d\n", ret); return ret; } These could become something like: static int airspy_set_mixer_gain(struct airspy *s) { int ret; u8 u8tmp; dev_dbg(s->dev, "mixer auto=%d->%d val=%d->%d\n", s->mixer_gain_auto->cur.val, s->mixer_gain_auto->val, s->mixer_gain->cur.val, s->mixer_gain->val); ret = airspy_ctrl_msg(s, CMD_SET_MIXER_AGC, 0, s->mixer_gain_auto->val, &u8tmp, 1); if (ret) goto err; if (s->mixer_gain_auto->val == false) { ret = airspy_ctrl_msg(s, CMD_SET_MIXER_GAIN, 0, s->mixer_gain->val, &u8tmp, 1); if (ret) goto err; } return 0; err: dev_dbg(s->dev, "failed=%d\n", ret); return ret; }