[22/23] wilc1000: minor syntax cleanup

Message ID	20211218235404.3963475-23-davidm@egauge.net
State	Superseded
Headers	show Return-Path: <linux-wireless-owner@kernel.org> From: David Mosberger-Tang <davidm@egauge.net> Subject: [PATCH 22/23] wilc1000: minor syntax cleanup Date: Sat, 18 Dec 2021 23:54:17 +0000 (UTC) Message-Id: <20211218235404.3963475-23-davidm@egauge.net> In-Reply-To: <20211218235404.3963475-1-davidm@egauge.net> References: <20211218235404.3963475-1-davidm@egauge.net> MIME-Version: 1.0 To: Ajay Singh <ajay.kathat@microchip.com> Cc: Claudiu Beznea <claudiu.beznea@microchip.com>, Kalle Valo <kvalo@codeaurora.org>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Mosberger-Tang <davidm@egauge.net> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Precedence: bulk
Series	wilc1000: rework tx path to use sk_buffs throughout \| expand [00/23] wilc1000: rework tx path to use sk_buffs throughout [04/23] wilc1000: factor common code in wilc_wlan_cfg_set() and wilc_wlan_cfg_get() [05/23] wilc1000: add wilc_wlan_tx_packet_done() function [01/23] wilc1000: don't hold txq_spinlock while initializing AC queue limits [03/23] wilc1000: move receive-queue stats from txq to wilc structure [06/23] wilc1000: move tx packet drop code into its own function [02/23] wilc1000: switch txq_event from completion to waitqueue [12/23] wilc1000: refactor wilc_wlan_cfg_commit() a bit [08/23] wilc1000: fix management packet type inconsistency [22/23] wilc1000: minor syntax cleanup [20/23] wilc1000: eliminate "max_size_over" variable in fill_vmm_table [21/23] wilc1000: declare read-only ac_preserve_ratio as static and const [17/23] wilc1000: remove no longer used "vif" argument from init_txq_entry() [10/23] wilc1000: factor initialization of tx queue-specific packet fields [13/23] wilc1000: sanitize config packet sequence number management a bit [09/23] wilc1000: prepare wilc_wlan_tx_packet_done() for sk_buff changes [16/23] wilc1000: switch tx queue to normal sk_buff entries [19/23] wilc1000: don't tell the chip to go to sleep while copying tx packets [18/23] wilc1000: split huge tx handler into subfunctions [14/23] wilc1000: if there is no tx packet, don't increment packets-sent counter [15/23] wilc1000: Add struct wilc_skb_tx_cb as an alias of struct txq_entry_t [23/23] wilc1000: introduce symbolic names for two tx-related control bits [07/23] wilc1000: increment tx_dropped stat counter on tx packet drop [11/23] wilc1000: convert tqx_entries from "int" to "atomic_t"

Message ID

20211218235404.3963475-23-davidm@egauge.net

State

Superseded

Headers

From: David Mosberger-Tang <davidm@egauge.net>
Subject: [PATCH 22/23] wilc1000: minor syntax cleanup
Date: Sat, 18 Dec 2021 23:54:17 +0000 (UTC)
Message-Id: <20211218235404.3963475-23-davidm@egauge.net>
In-Reply-To: <20211218235404.3963475-1-davidm@egauge.net>
References: <20211218235404.3963475-1-davidm@egauge.net>
MIME-Version: 1.0
To: Ajay Singh <ajay.kathat@microchip.com>
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>,
        Kalle Valo <kvalo@codeaurora.org>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        David Mosberger-Tang <davidm@egauge.net>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=us-ascii
Precedence: bulk

Series

wilc1000: rework tx path to use sk_buffs throughout | expand

Commit Message

David Mosberger-Tang Dec. 18, 2021, 11:54 p.m. UTC

Remove extraneous parentheses and braces.

Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
 drivers/net/wireless/microchip/wilc1000/wlan.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c
index debed2f159215..4ec23b2b2da05 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.c
@@ -653,10 +653,9 @@  static int fill_vmm_table(const struct wilc *wilc,
 				continue;
 
 			ac_exist = 1;
-			for (k = 0; (k < num_pkts_to_add[ac]) && tqe_q[ac]; k++) {
-				if (i >= (WILC_VMM_TBL_SIZE - 1)) {
+			for (k = 0; k < num_pkts_to_add[ac] && tqe_q[ac]; k++) {
+				if (i >= WILC_VMM_TBL_SIZE - 1)
 					goto out;
-				}
 
 				tx_cb = WILC_SKB_TX_CB(tqe_q[ac]);
 				if (tx_cb->type == WILC_CFG_PKT)
@@ -669,9 +668,8 @@  static int fill_vmm_table(const struct wilc *wilc,
 				vmm_sz += tqe_q[ac]->len;
 				vmm_sz = ALIGN(vmm_sz, 4);
 
-				if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE) {
+				if (sum + vmm_sz > WILC_TX_BUFF_SIZE)
 					goto out;
-				}
 				vmm_table[i] = vmm_sz / 4;
 				if (tx_cb->type == WILC_CFG_PKT)
 					vmm_table[i] |= BIT(10);
@@ -735,10 +733,8 @@  static int send_vmm_table(struct wilc *wilc, int i, const u32 *vmm_table)
 
 	timeout = 200;
 	do {
-		ret = func->hif_block_tx(wilc,
-					 WILC_VMM_TBL_RX_SHADOW_BASE,
-					 (u8 *)vmm_table,
-					 ((i + 1) * 4));
+		ret = func->hif_block_tx(wilc, WILC_VMM_TBL_RX_SHADOW_BASE,
+					 (u8 *)vmm_table, (i + 1) * 4);
 		if (ret)
 			break;

[22/23] wilc1000: minor syntax cleanup

Commit Message

Patch