From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757510AbcAYREl (ORCPT ); Mon, 25 Jan 2016 12:04:41 -0500 Received: from lists.s-osg.org ([54.187.51.154]:46293 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757240AbcAYREi (ORCPT ); Mon, 25 Jan 2016 12:04:38 -0500 Date: Mon, 25 Jan 2016 15:04:32 -0200 From: Mauro Carvalho Chehab To: SF Markus Elfring Cc: linux-media@vger.kernel.org, LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH 2/2] [media] r820t: Better exception handling in generic_set_freq() Message-ID: <20160125150432.79297280@recife.lan> In-Reply-To: <56816416.2060702@users.sourceforge.net> References: <566ABCD9.1060404@users.sourceforge.net> <56816256.70304@users.sourceforge.net> <56816416.2060702@users.sourceforge.net> Organization: Samsung X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, 28 Dec 2015 17:32:22 +0100 SF Markus Elfring escreveu: > From: Markus Elfring > Date: Mon, 28 Dec 2015 17:13:02 +0100 > > This issue was detected by using the Coccinelle software. > > Move the jump label directly before the desired log statement > so that the variable "rc" will not be checked once more > after a function call. > Use the identifier "report_failure" instead of "err". > > The error logging is performed in a separate section at the end now. > > Signed-off-by: Markus Elfring > --- > drivers/media/tuners/r820t.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c > index 6ab35e3..f71642e 100644 > --- a/drivers/media/tuners/r820t.c > +++ b/drivers/media/tuners/r820t.c > @@ -1303,7 +1303,7 @@ static int generic_set_freq(struct dvb_frontend *fe, > > rc = r820t_set_tv_standard(priv, bw, type, std, delsys); > if (rc < 0) > - goto err; > + goto report_failure; Same thing as my previous comment: just "err" please. Same applies to other patches you sent with similar hunks. > > if ((type == V4L2_TUNER_ANALOG_TV) && (std == V4L2_STD_SECAM_LC)) > lo_freq = freq - priv->int_freq; > @@ -1312,23 +1312,21 @@ static int generic_set_freq(struct dvb_frontend *fe, > > rc = r820t_set_mux(priv, lo_freq); > if (rc < 0) > - goto err; > + goto report_failure; > > rc = r820t_set_pll(priv, type, lo_freq); > if (rc < 0 || !priv->has_lock) > - goto err; > + goto report_failure; > > rc = r820t_sysfreq_sel(priv, freq, type, std, delsys); > if (rc < 0) > - goto err; > + goto report_failure; > > tuner_dbg("%s: PLL locked on frequency %d Hz, gain=%d\n", > __func__, freq, r820t_read_gain(priv)); > - > -err: > - > - if (rc < 0) > - tuner_dbg("%s: failed=%d\n", __func__, rc); > + return 0; > +report_failure: > + tuner_dbg("%s: failed=%d\n", __func__, rc); > return rc; > } >