[PATCH v3] Staging: vt6656: Checkpatch fix: else after break or return

Emrys Bayliss
2015-01-13T17:14:54Z

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 <emrys@paradise.net.nz>
---
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,
--
2.2.1