From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbbAaWcL (ORCPT ); Sat, 31 Jan 2015 17:32:11 -0500 Received: from mail-wi0-f181.google.com ([209.85.212.181]:50639 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750898AbbAaWcG (ORCPT ); Sat, 31 Jan 2015 17:32:06 -0500 Message-ID: <54CD57DF.3020903@gmail.com> Date: Sat, 31 Jan 2015 22:31:59 +0000 From: Malcolm Priestley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Derrick Greenspan , Greg Kroah-Hartman , Forest Bond , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: Re: [PATCHv3] staging: vt6656: removed erroneous else statement References: <1422731121-5560-1-git-send-email-derrick.greenspan@knights.ucf.edu> In-Reply-To: <1422731121-5560-1-git-send-email-derrick.greenspan@knights.ucf.edu> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/01/15 19:05, Derrick Greenspan wrote: > This patch fixes the checkpatch.pl warning: > > WARNING: else is not generally useful after a break or return > 559: FILE: drivers/staging/vt6656/rxtx.c:559: Checkpatch does not check that the if and else has different function scope. It isn't erroneous but now looks a little odd. If it really bothers people split the function into two. Malcolm > return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head); > } else { > > Signed-off-by: Derrick Greenspan > --- > Changes in v2: > - Hopefully fixed whitespace! > Changes in v3: > - Fixed GCC compiler warning > --- > drivers/staging/vt6656/rxtx.c | 33 ++++++++++++++++----------------- > 1 file changed, 16 insertions(+), 17 deletions(-) > > diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c > index b74f672..cb5d5ca 100644 > --- a/drivers/staging/vt6656/rxtx.c > +++ b/drivers/staging/vt6656/rxtx.c > @@ -556,25 +556,24 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, > ether_addr_copy(buf->data.ra, priv->current_net_addr); > > 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, > - priv->top_cck_basic_rate, PK_TYPE_11B, &buf->b); > - /* Get CTSDuration_ba */ > - buf->duration_ba = > - vnt_get_rtscts_duration_le(tx_context, CTSDUR_BA, > - tx_context->pkt_type, > - current_rate); > - /*Get CTS Frame body*/ > - buf->data.duration = buf->duration_ba; > - buf->data.frame_control = > - cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); > + } > + struct vnt_cts *buf = &head->cts_g; > + /* Get SignalField,ServiceField,Length */ > + vnt_get_phy_field(priv, cts_frame_len, > + priv->top_cck_basic_rate, PK_TYPE_11B, &buf->b); > + /* Get CTSDuration_ba */ > + buf->duration_ba = > + vnt_get_rtscts_duration_le(tx_context, CTSDUR_BA, > + tx_context->pkt_type, > + current_rate); > + /*Get CTS Frame body*/ > + buf->data.duration = buf->duration_ba; > + buf->data.frame_control = > + cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); > > - ether_addr_copy(buf->data.ra, priv->current_net_addr); > + ether_addr_copy(buf->data.ra, priv->current_net_addr); > > - return vnt_rxtx_datahead_g(tx_context, &buf->data_head); > - } > + return vnt_rxtx_datahead_g(tx_context, &buf->data_head); > } > > static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, >