Re: [PATCHv3] staging: vt6656: removed erroneous else statement

[Malcolm Priestley <tvboxspy@gmail.com>]

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 <derrick.greenspan@knights.ucf.edu>
> ---
> 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,
>