Linux wireless drivers development
 help / color / mirror / Atom feed
From: Ajay Singh <ajay.kathat@microchip.com>
To: <linux-wireless@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
	<ganesh.krishna@microchip.com>, <venkateswara.kaja@microchip.com>,
	<aditya.shankar@microchip.com>, <claudiu.beznea@microchip.com>,
	<adham.abozaeid@Microchip.com>,
	Ajay Singh <ajay.kathat@microchip.com>
Subject: [PATCH 3/8] staging: wilc1000: fix line over 80 char in wilc_wlan_handle_txq()
Date: Mon, 26 Feb 2018 22:01:57 +0530	[thread overview]
Message-ID: <1519662722-15761-4-git-send-email-ajay.kathat@microchip.com> (raw)
In-Reply-To: <1519662722-15761-1-git-send-email-ajay.kathat@microchip.com>

Refactor wilc_wlan_handle_txq() to fix 'line over 80 char' issue found
by checkpatch.pl script.

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

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 5422359..ee7102d 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -707,49 +707,51 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
 	offset = 0;
 	i = 0;
 	do {
+		u32 header, buffer_offset;
+		char *bssid;
+
 		tqe = wilc_wlan_txq_remove_from_head(dev);
-		if (tqe && vmm_table[i] != 0) {
-			u32 header, buffer_offset;
+		if (!tqe)
+			break;
 
-			vmm_table[i] = cpu_to_le32(vmm_table[i]);
-			vmm_sz = (vmm_table[i] & 0x3ff);
-			vmm_sz *= 4;
-			header = (tqe->type << 31) |
-				 (tqe->buffer_size << 15) |
-				 vmm_sz;
-			if (tqe->type == WILC_MGMT_PKT)
-				header |= BIT(30);
-			else
-				header &= ~BIT(30);
+		if (vmm_table[i] == 0)
+			break;
 
-			header = cpu_to_le32(header);
-			memcpy(&txb[offset], &header, 4);
-			if (tqe->type == WILC_CFG_PKT) {
-				buffer_offset = ETH_CONFIG_PKT_HDR_OFFSET;
-			} else if (tqe->type == WILC_NET_PKT) {
-				char *bssid = ((struct tx_complete_data *)(tqe->priv))->bssid;
-
-				buffer_offset = ETH_ETHERNET_HDR_OFFSET;
-				memcpy(&txb[offset + 8], bssid, 6);
-			} else {
-				buffer_offset = HOST_HDR_OFFSET;
-			}
+		vmm_table[i] = cpu_to_le32(vmm_table[i]);
+		vmm_sz = (vmm_table[i] & 0x3ff);
+		vmm_sz *= 4;
+		header = (tqe->type << 31) |
+			 (tqe->buffer_size << 15) |
+			 vmm_sz;
+		if (tqe->type == WILC_MGMT_PKT)
+			header |= BIT(30);
+		else
+			header &= ~BIT(30);
 
-			memcpy(&txb[offset + buffer_offset],
-			       tqe->buffer, tqe->buffer_size);
-			offset += vmm_sz;
-			i++;
-			tqe->status = 1;
-			if (tqe->tx_complete_func)
-				tqe->tx_complete_func(tqe->priv,
-						      tqe->status);
-			if (tqe->tcp_pending_ack_idx != NOT_TCP_ACK &&
-			    tqe->tcp_pending_ack_idx < MAX_PENDING_ACKS)
-				pending_acks_info[tqe->tcp_pending_ack_idx].txqe = NULL;
-			kfree(tqe);
+		header = cpu_to_le32(header);
+		memcpy(&txb[offset], &header, 4);
+		if (tqe->type == WILC_CFG_PKT) {
+			buffer_offset = ETH_CONFIG_PKT_HDR_OFFSET;
+		} else if (tqe->type == WILC_NET_PKT) {
+			bssid = ((struct tx_complete_data *)(tqe->priv))->bssid;
+
+			buffer_offset = ETH_ETHERNET_HDR_OFFSET;
+			memcpy(&txb[offset + 8], bssid, 6);
 		} else {
-			break;
+			buffer_offset = HOST_HDR_OFFSET;
 		}
+
+		memcpy(&txb[offset + buffer_offset],
+		       tqe->buffer, tqe->buffer_size);
+		offset += vmm_sz;
+		i++;
+		tqe->status = 1;
+		if (tqe->tx_complete_func)
+			tqe->tx_complete_func(tqe->priv, tqe->status);
+		if (tqe->tcp_pending_ack_idx != NOT_TCP_ACK &&
+		    tqe->tcp_pending_ack_idx < MAX_PENDING_ACKS)
+			pending_acks_info[tqe->tcp_pending_ack_idx].txqe = NULL;
+		kfree(tqe);
 	} while (--entries);
 
 	acquire_bus(wilc, ACQUIRE_AND_WAKEUP);
-- 
2.7.4

  parent reply	other threads:[~2018-02-26 16:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-26 16:31 [PATCH 0/8] staging: wilc1000: fix coding style & checkpatch reported issues Ajay Singh
2018-02-26 16:31 ` [PATCH 1/8] staging: wilc1000: remove unnecessary while(0) in wilc_wlan_handle_txq() Ajay Singh
2018-02-26 16:31 ` [PATCH 2/8] staging: wilc1000: rename label _end_ " Ajay Singh
2018-02-26 16:31 ` Ajay Singh [this message]
2018-02-26 16:31 ` [PATCH 4/8] staging: wilc1000: move multiple definition of same macro to common header Ajay Singh
2018-02-26 16:31 ` [PATCH 5/8] staging: wilc1000: rename WILC_WFI_mgmt_rx() to avoid camelCase Ajay Singh
2018-02-26 16:32 ` [PATCH 6/8] staging: wilc1000: fix line over 80 char in wilc_wlan_handle_rxq() Ajay Singh
2018-02-27  9:35   ` Dan Carpenter
2018-02-26 16:32 ` [PATCH 7/8] staging: wilc1000: fix line over 80 char in wilc_wlan_cfg_set() Ajay Singh
2018-02-27  9:36   ` Dan Carpenter
2018-02-27  9:50   ` Dan Carpenter
2018-02-26 16:32 ` [PATCH 8/8] staging: wilc1000: fix open parenthesis mismatch issue " Ajay Singh
2018-02-27  9:41   ` Dan Carpenter
2018-02-27 13:23     ` Ajay Singh
2018-02-27 13:26       ` Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519662722-15761-4-git-send-email-ajay.kathat@microchip.com \
    --to=ajay.kathat@microchip.com \
    --cc=adham.abozaeid@Microchip.com \
    --cc=aditya.shankar@microchip.com \
    --cc=claudiu.beznea@microchip.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=ganesh.krishna@microchip.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=venkateswara.kaja@microchip.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox