diff mbox

[6/8] staging: wilc1000: fix line over 80 char in wilc_wlan_handle_rxq()

Message ID 1519662722-15761-7-git-send-email-ajay.kathat@microchip.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Ajay Singh Feb. 26, 2018, 4:32 p.m. UTC 
Fix 'line over 80 character' issue found by checkpatch.pl script.
Refactor wilc_wlan_handle_rxq() code to remove the checkpatch.pl
warnings.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/wilc_wlan.c | 46 ++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 21 deletions(-)

Comments

Dan Carpenter Feb. 27, 2018, 9:35 a.m. UTC | #1 
On Mon, Feb 26, 2018 at 10:02:00PM +0530, Ajay Singh wrote:
> Fix 'line over 80 character' issue found by checkpatch.pl script.
> Refactor wilc_wlan_handle_rxq() code to remove the checkpatch.pl
> warnings.
> 
> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
> ---
>  drivers/staging/wilc1000/wilc_wlan.c | 46 ++++++++++++++++++++----------------
>  1 file changed, 25 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
> index 74b80ad..223bf8b 100644
> --- a/drivers/staging/wilc1000/wilc_wlan.c
> +++ b/drivers/staging/wilc1000/wilc_wlan.c
> @@ -798,6 +798,7 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
>  			u32 header;
>  			u32 pkt_len, pkt_offset, tp_len;
>  			int is_cfg_packet;
> +			int tmp;
>  

Heh.  Nope.  Don't do this.  You've just create a "tmp" variable to hold
many different types of random long values...  It makes the code less
readable.

Just break it up into separate functions.

regards,
dan carpenter
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 74b80ad..223bf8b 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -798,6 +798,7 @@  static void wilc_wlan_handle_rxq(struct wilc *wilc)
 			u32 header;
 			u32 pkt_len, pkt_offset, tp_len;
 			int is_cfg_packet;
+			int tmp;
 
 			memcpy(&header, &buffer[offset], 4);
 			header = cpu_to_le32(header);
@@ -815,28 +816,31 @@  static void wilc_wlan_handle_rxq(struct wilc *wilc)
 						IS_MANAGMEMENT_CALLBACK |
 						IS_MGMT_STATUS_SUCCES);
 
-				wilc_wfi_mgmt_rx(wilc, &buffer[offset + HOST_HDR_OFFSET], pkt_len);
+				tmp = offset + HOST_HDR_OFFSET;
+				wilc_wfi_mgmt_rx(wilc, &buffer[tmp], pkt_len);
+			} else if (!is_cfg_packet) {
+				if (pkt_len > 0) {
+					wilc_frmw_to_linux(wilc,
+							   &buffer[offset],
+							   pkt_len,
+							   pkt_offset);
+				}
 			} else {
-				if (!is_cfg_packet) {
-					if (pkt_len > 0) {
-						wilc_frmw_to_linux(wilc,
-								   &buffer[offset],
-								   pkt_len,
-								   pkt_offset);
-					}
-				} else {
-					struct wilc_cfg_rsp rsp;
-
-					wilc_wlan_cfg_indicate_rx(wilc, &buffer[pkt_offset + offset], pkt_len, &rsp);
-					if (rsp.type == WILC_CFG_RSP) {
-						if (wilc->cfg_seq_no == rsp.seq_no)
-							complete(&wilc->cfg_event);
-					} else if (rsp.type == WILC_CFG_RSP_STATUS) {
-						wilc_mac_indicate(wilc, WILC_MAC_INDICATE_STATUS);
-
-					} else if (rsp.type == WILC_CFG_RSP_SCAN) {
-						wilc_mac_indicate(wilc, WILC_MAC_INDICATE_SCAN);
-					}
+				struct wilc_cfg_rsp rsp;
+
+				tmp = pkt_offset + offset;
+				wilc_wlan_cfg_indicate_rx(wilc, &buffer[tmp],
+							  pkt_len, &rsp);
+				if (rsp.type == WILC_CFG_RSP) {
+					if (wilc->cfg_seq_no == rsp.seq_no)
+						complete(&wilc->cfg_event);
+				} else if (rsp.type == WILC_CFG_RSP_STATUS) {
+					tmp = WILC_MAC_INDICATE_STATUS;
+					wilc_mac_indicate(wilc, tmp);
+
+				} else if (rsp.type == WILC_CFG_RSP_SCAN) {
+					tmp = WILC_MAC_INDICATE_SCAN;
+					wilc_mac_indicate(wilc, tmp);
 				}
 			}
 			offset += tp_len;