From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbbAQXcJ (ORCPT ); Sat, 17 Jan 2015 18:32:09 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:55902 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751839AbbAQXcH (ORCPT ); Sat, 17 Jan 2015 18:32:07 -0500 Date: Sat, 17 Jan 2015 14:49:05 -0800 From: Greg KH To: Emrys Bayliss Cc: forest@alittletooquiet.net, tvboxspy@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] Staging: vt6656: Checkpatch fix: else after break or return Message-ID: <20150117224905.GA6847@kroah.com> References: <1421169178-30345-1-git-send-email-emrys@paradise.net.nz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1421169178-30345-1-git-send-email-emrys@paradise.net.nz> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 14, 2015 at 04:12:58AM +1100, Emrys Bayliss wrote: > This patch fixes the following checkpatch.pl error: > rxtx.c:558: WARNING: else is not generally useful after a break or return > > Signed-off-by: Emrys Bayliss > --- > The else statement was replaced with a block to avoid the following > compiler error: > "warning: ISO C90 forbids mixed declarations and code" > due to this declaration: > struct vnt_cts *buf = &head->cts_g; (line 559) > > Is there a better way such as using head (a union) directly instead? > > The last patch I sent removed the return 0. Since this isn't related to > the error in the title I left it for a separate patch. > > drivers/staging/vt6656/rxtx.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c > index ea5140a..831a051 100644 > --- a/drivers/staging/vt6656/rxtx.c > +++ b/drivers/staging/vt6656/rxtx.c > @@ -555,7 +555,9 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, > memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN); > > return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head); > - } else { > + } > + > + { > struct vnt_cts *buf = &head->cts_g; > /* Get SignalField,ServiceField,Length */ > vnt_get_phy_field(priv, cts_frame_len, As I said before, this is not correct, please fix it up properly.