From patchwork Mon Sep 13 08:30:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 511512 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D21B2C433FE for ; Mon, 13 Sep 2021 08:32:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA703610A0 for ; Mon, 13 Sep 2021 08:32:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238309AbhIMIdl (ORCPT ); Mon, 13 Sep 2021 04:33:41 -0400 Received: from mail-bn8nam12on2064.outbound.protection.outlook.com ([40.107.237.64]:55755 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238126AbhIMIdO (ORCPT ); Mon, 13 Sep 2021 04:33:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BOSOrGlqeoWcKD21qiYcTBS8qJwBKfdaaFB7u0KJpXZ4ZQCKS+hRQp3bzcNFc2+JNZHj+MX7oZ2WEWMm9L4NOLjRB3Z+KgxB5XXBU3+szQRpNV3xe3UmhT4ZHvc702W2v3V0fJMrnNJk8AY2wg9nefTd7naR4OzqVkrlwYoc7jRqM0q5BzqsKkbYoAQZfvso4Jkbj1JlXCVRNZ77ESFzRd0Ye05qqsw6PXYbTxNt08K+CP9D9nQ78m3LO3mTZCz6f5Rx26dEvMSk7sCCznCow6cWMZEomu8EYvyq0m7R+zgtHpfFtXBEyUt0ECeUeXsS+t3vkTsdCX1iN3n5gJsvEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ukiiaXuHB68lNESJa7s+KPhr2UdHv8KEhL2rJ3/GeVg=; b=UfwBUviiBf87r2xKUoZUCOBhkTAze1fyhpk6ofaNgkOp6+7fqU0VDJ7YWmHdyz0ueK9PCh1bedpEcEL/wb2WqHMw/QkM3c8rIoLmRm+0HGmh4GqimnrNTnDWwTTuZmpTy3SXbyngB7xc7IB/IcjVA13fRyo61ktUtal16MXVCIEjQ2GDEAyh/dB+NciGOsBlzYtcrCNFC6XPQ3n78EXEx+wSQ8ImL0DM7i6Rgdag6D5ilkViCiZdoe2HDcDDE7Z5Q+3eEmPc57sAsuUEcQ8i+yQ1kyiUE05vuCj2GtlpAj/uFjMSP3Q2Xbiv/W5qY4I/aOMlKaEu+2sYu0yGzLqw5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ukiiaXuHB68lNESJa7s+KPhr2UdHv8KEhL2rJ3/GeVg=; b=JSyV/to6s4W0W5ONL7o/xnWgcLHgg594mu+J4x5Epb3tnxU9iNpQd9wlP3qUBM6xoXrhQr+AGBApithpXfusvjzyUV38yuAMD/K0HXQ8lYtb4whyaL7hYN5GxN9YNluuK1xO7jq6SYUWiLq6IZHKlfVl/3gnPfpCPNCrJKbIXn4= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none; driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (52.135.97.18) by SN6PR11MB3263.namprd11.prod.outlook.com (52.135.109.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 08:31:47 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::7050:a0a:415:2ccd]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::7050:a0a:415:2ccd%7]) with mapi id 15.20.4500.017; Mon, 13 Sep 2021 08:31:47 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH v2 08/33] staging: wfx: take advantage of wfx_tx_queue_empty() Date: Mon, 13 Sep 2021 10:30:20 +0200 Message-Id: <20210913083045.1881321-9-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913083045.1881321-1-Jerome.Pouiller@silabs.com> References: <20210913083045.1881321-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PAZP264CA0067.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fd::10) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 Received: from pc-42.silabs.com (37.71.187.125) by PAZP264CA0067.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 08:31:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c120811-c4b0-4357-7276-08d97690dbbf X-MS-TrafficTypeDiagnostic: SN6PR11MB3263: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:549; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UGVD7iG7rZ45Dkq+PqZFgRu8Dx04Z1uR15co5sm9vZoKS75Gne6RlsphFUkQOF9SkFOf41qd2DJ9xXGxJVjnunGjRi68DMT8I1/I//7eT23WrBoQoa1Y0ixPMATpC8mTRJQGM04S1Sy+zC24HdJiFf7aesjDTLago4+j8O+1O7K+aRK6stQxw94kuYjxMTHPq3mDWWVFfPXnLgZz6XqnpxaKDEqbDmrMqikh5WLZaCx3sGtAF/4uacakuoBsOp6beQhjFTkrOYq/BKQcF7BHSyVIRj1X7Va9Nd16p8erzrKX542LtmaUq1xfoQiYAPUD2OPizYnabZsccG+DcTatHB6aX9WSNNAqOmraxKRxPJd5zt9OE2aCzSNj+rzof7AjvxdB26HyGFwn5Vfpes6GkwliNUo5jiD/lvk/39sfj2SGZI3rhh9iW/E3d8VRnS44PrRiLtsORE4hrId2dmCME2/r3FjzT6rY/u1QnxgjGZVG47kk9lkbx/CC9mqT6en6CwqUDUqKzzkbF1nfIFjJrYfm1TGuzIk/h6/ZCv1ArbuKXOJ4c2s6s6lKnEVxBiV6JoDdUY0TVxTK2Q5ykUtb3irnuNIMfUQswlCDR48n0UApEZR6JT1RS8elCu99zZ0YkAboeAKwjCfVfSyU769ohten5m+LzGDKeixLOorWTmW8XdZsW2znAq81+rc28m4R X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2718.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(83380400001)(66574015)(107886003)(956004)(2616005)(5660300002)(54906003)(38350700002)(4326008)(6666004)(316002)(38100700002)(66946007)(26005)(66476007)(66556008)(186003)(8676002)(36756003)(8936002)(86362001)(508600001)(52116002)(7696005)(6486002)(1076003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?crkGnC4M6EAKKban7Sn5IYsLB?= =?utf-8?q?Jty1T3uQLOcakVM64B9uTv6dsCDbI6aLrYQ4IUNapj9aMAe5T+zwn/nS?= =?utf-8?q?t7jvN+gHgb8UprcqjvyHyfmEeyaMiWLMhRhZB+3aRvV5ErkpBSOgfQDe?= =?utf-8?q?EWZfQZnSQ2Qi5OOIZY3a5ijFVeMaB3jccatQVFdOl1KR1UmVDza8AKDF?= =?utf-8?q?cI4f4tr6O+B2260pPdbTGvf7DrAKVc7OCuizFNEpbTxSIytzti99UtkA?= =?utf-8?q?CYzJbXBwqZIiTT0GyaGCascbodoLUdLjKYmpOpiqqWSh1kP8z8KV8JkQ?= =?utf-8?q?xqPvnKid7xyCyaV14i26b92RBgz2P1uXFcuDWohnlgMmvpQSyPzAzshb?= =?utf-8?q?V24FfyuStTRCQ7XEp3CLpzaQ60ex5nBuPPFcGhF2Bd+K89NMIVrR63kQ?= =?utf-8?q?eSlnHp4CgNnotq8GtHnnhyAFclkjTU1HkMSoCg/N1eqoxPxs8ZqJVa3k?= =?utf-8?q?aPWJqZTvjWKU5xa+uSYWjONp8BLSeabLx160aZkZtI1LC0jTqNll7IXV?= =?utf-8?q?P519QBjL4pfFhw24dyZZGmviee6TrCwlq8ykikCxRHNUjTYugr4FMhr/?= =?utf-8?q?QHTNjAU0PS2drwull2zlQudv+QfQHeiY74LYQ6vsZXHUpwSyJWXN/fcv?= =?utf-8?q?NjF9jRLxnTjyDEEp9EN7UbZzOm7OOYWX94CusK0vEQ8qj3LyWysOmygr?= =?utf-8?q?VYljDrcFnCQ/NgqQASBS4ULLYNzeKkXizPW7j+JLj9LgHD7laQ618VPS?= =?utf-8?q?sOoW0HwgsP90vxucR0un5QXm2oOxChCv3cVSvTWZjed0GjKqvXa33pIn?= =?utf-8?q?t65W7LvC7yy4ZJV49xVkxxUf799D3NelrA4dAwEKf6dCt51THinyF9lz?= =?utf-8?q?bWiUAFargG7uQYemi4PzsSeQLnkE/+IeT6+b46RroDPJbij1v14it84u?= =?utf-8?q?zJKftsWhCEjJeg8QC989Wzr06SRtPBE7sMhGLRMSIOVQPshZ7tuxjJm2?= =?utf-8?q?WbgGHyJZo3WA3bQmCJtg8G6d2MTC4Qhe5BCtxsaYTl5whCT54bnMbNf7?= =?utf-8?q?ilgqGG2SyImrKKmzK/6LU7kYlz5xX11b15rha89lYOmb8lvlcwNZlb7A?= =?utf-8?q?GvWspx6aTM0Sko3rnE3xQwthrYpnMHDAZmYEnm7hRpQHqyvZIMW9dUh9?= =?utf-8?q?ykPKpaS4lqkmiHhH12zZl8qDl+i5j8gCntGcGVTqZMAXgyXmKs5Mu1s7?= =?utf-8?q?mqQX0p5H9NqVXS2WidfHERWnKd38UYg6D7kEbU5nCbvPd8H0+dvqyLwU?= =?utf-8?q?iYEfP9hq006EQdgl+0hqF/ymItFUI+n27v+xZnmEpm4YBwwP8hx7wQBk?= =?utf-8?q?5GwJ8O2n5defjOsnwrYYnXgqWpq3hQT?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c120811-c4b0-4357-7276-08d97690dbbf X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 08:31:18.4940 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m/ZTkMfvZ0wZczqJSBEQv0yBNLcmw1SVY80sqbSp0HAXRVpl+GnI+nSJz+14vGBuIMWX7rZO11kClU0tFeCg+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3263 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller wfx_tx_queues_check_empty() can be slightly simplified by calling wfx_tx_queue_empty(). Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/queue.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index fa272c120f1c..0ab207237d9f 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -73,23 +73,22 @@ void wfx_tx_queues_init(struct wfx_vif *wvif) } } -void wfx_tx_queues_check_empty(struct wfx_vif *wvif) -{ - int i; - - for (i = 0; i < IEEE80211_NUM_ACS; ++i) { - WARN_ON(atomic_read(&wvif->tx_queue[i].pending_frames)); - WARN_ON(!skb_queue_empty_lockless(&wvif->tx_queue[i].normal)); - WARN_ON(!skb_queue_empty_lockless(&wvif->tx_queue[i].cab)); - } -} - bool wfx_tx_queue_empty(struct wfx_vif *wvif, struct wfx_queue *queue) { return skb_queue_empty_lockless(&queue->normal) && skb_queue_empty_lockless(&queue->cab); } +void wfx_tx_queues_check_empty(struct wfx_vif *wvif) +{ + int i; + + for (i = 0; i < IEEE80211_NUM_ACS; ++i) { + WARN_ON(atomic_read(&wvif->tx_queue[i].pending_frames)); + WARN_ON(!wfx_tx_queue_empty(wvif, &wvif->tx_queue[i])); + } +} + static void __wfx_tx_queue_drop(struct wfx_vif *wvif, struct sk_buff_head *skb_queue, struct sk_buff_head *dropped)