From patchwork Thu Dec 23 01:14:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Mosberger-Tang X-Patchwork-Id: 12697813 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D65AAC433F5 for ; Thu, 23 Dec 2021 01:14:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241991AbhLWBOV (ORCPT ); Wed, 22 Dec 2021 20:14:21 -0500 Received: from o1.ptr2625.egauge.net ([167.89.112.53]:18272 "EHLO o1.ptr2625.egauge.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345694AbhLWBON (ORCPT ); Wed, 22 Dec 2021 20:14:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=egauge.net; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type; s=sgd; bh=8dwPvDwhfyU5dMZPpdOsVTnb3/1u+mRXqp7YaVTNdGU=; b=R3yiLGLs1uZQGXBA5TY6+EOguEXdgO+NFMS9YERcdysDiQ74J09QGW0gtwwaBTwIb3lP 14/s3VZ0MrU9V1Esh6nxwkFlnkeAu3oeTqnb0+GCprOZ2Df8Hl+HIRdfh93KlGnbickV4r 1rZLqvK+Ryd+uNTMUH0qyT4sXyAUeny5SIYKZWoBM3zVFvoDr62sOI5L3QZ6OSDyNDTNii +jSXr56RBOU3/8NPVBHcv6KWTgdql3C6HQ5pKMM1C2a9ZhBW0ayYJ4xgu3ka1nT/lNMthz wryFmVZf8EqOks5TDp/IJXqehiHzMHQEUeON2RlHmpY5/db5fYfDIguaWdaah8tw== Received: by filterdrecv-656998cfdd-mht2v with SMTP id filterdrecv-656998cfdd-mht2v-1-61C3CD5E-18 2021-12-23 01:14:06.608787935 +0000 UTC m=+7955208.093419968 Received: from pearl.egauge.net (unknown) by geopod-ismtpd-5-1 (SG) with ESMTP id vPbHODG4Sse8dQwPEkefYg Thu, 23 Dec 2021 01:14:06.453 +0000 (UTC) Received: by pearl.egauge.net (Postfix, from userid 1000) id 443A8701397; Wed, 22 Dec 2021 18:14:05 -0700 (MST) From: David Mosberger-Tang Subject: [PATCH v2 20/50] wilc1000: eliminate "max_size_over" variable in fill_vmm_table Date: Thu, 23 Dec 2021 01:14:06 +0000 (UTC) Message-Id: <20211223011358.4031459-21-davidm@egauge.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211223011358.4031459-1-davidm@egauge.net> References: <20211223011358.4031459-1-davidm@egauge.net> MIME-Version: 1.0 X-SG-EID: +kMxBqj35EdRUKoy8diX1j4AXmPtd302oan+iXZuF8m2Nw4HRW2irNspffT/khET6RJF6+Prbl0h/EtF1rRLvBovVGGUqsKDfRdCLg1PJA3t8foKn9E0eDBioSfxjXTPS/qEtvMwuU7eykaxv403jcXR8Nu5mfoqIItxiNmkjMVxhl4hBfkqmC0XIYwOtnLhWYccdH5ZTNO9Sl4YHoQfF18jJkyZOYbbp6ce3kYK9woDOQpgAguuyh73F/ZA02ZoQ+ynW4/gUiNcP6K4eQZwlA== To: Ajay Singh Cc: Claudiu Beznea , Kalle Valo , "David S. Miller" , Jakub Kicinski , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Mosberger-Tang X-Entity-ID: Xg4JGAcGrJFIz2kDG9eoaQ== Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This makes the code tighter and easier to understand. Signed-off-by: David Mosberger-Tang --- drivers/net/wireless/microchip/wilc1000/wlan.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index a6064a85140b4..dc6608390591c 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -638,7 +638,7 @@ static int fill_vmm_table(const struct wilc *wilc, u32 sum; u8 ac_preserve_ratio[NQUEUES] = {1, 1, 1, 1}; u8 *num_pkts_to_add; - bool max_size_over = 0, ac_exist = 0; + bool ac_exist = 0; int vmm_sz = 0; struct sk_buff *tqe_q[NQUEUES]; struct wilc_skb_tx_cb *tx_cb; @@ -648,20 +648,17 @@ static int fill_vmm_table(const struct wilc *wilc, i = 0; sum = 0; - max_size_over = 0; num_pkts_to_add = ac_desired_ratio; do { ac_exist = 0; - for (ac = 0; (ac < NQUEUES) && (!max_size_over); ac++) { + for (ac = 0; ac < NQUEUES; ac++) { if (!tqe_q[ac]) continue; ac_exist = 1; - for (k = 0; (k < num_pkts_to_add[ac]) && - (!max_size_over) && tqe_q[ac]; k++) { + for (k = 0; (k < num_pkts_to_add[ac]) && tqe_q[ac]; k++) { if (i >= (WILC_VMM_TBL_SIZE - 1)) { - max_size_over = 1; - break; + goto out; } tx_cb = WILC_SKB_TX_CB(tqe_q[ac]); @@ -676,8 +673,7 @@ static int fill_vmm_table(const struct wilc *wilc, vmm_sz = ALIGN(vmm_sz, 4); if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE) { - max_size_over = 1; - break; + goto out; } vmm_table[i] = vmm_sz / 4; if (tx_cb->type == WILC_CFG_PKT) @@ -693,8 +689,8 @@ static int fill_vmm_table(const struct wilc *wilc, } } num_pkts_to_add = ac_preserve_ratio; - } while (!max_size_over && ac_exist); - + } while (ac_exist); +out: vmm_table[i] = 0x0; return i; }