From patchwork Mon Sep 13 13:01:39 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: 12488955 X-Patchwork-Delegate: johannes@sipsolutions.net 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 543C0C433F5 for ; Mon, 13 Sep 2021 13:03:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40FBD60E8B for ; Mon, 13 Sep 2021 13:03:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239067AbhIMNE0 (ORCPT ); Mon, 13 Sep 2021 09:04:26 -0400 Received: from mail-bn8nam08on2055.outbound.protection.outlook.com ([40.107.100.55]:54369 "EHLO NAM04-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S239080AbhIMND4 (ORCPT ); Mon, 13 Sep 2021 09:03:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bculkg5t6NFBZBPr0crWO+b7k3QcmlAYaL7rwF3s4GXfI0d668FrHh4uv431BY/h63wTMTaOg3CpRgycGmYQlRhjLkO1RYuikMNK5SkKWocluZtfC79Cub9W2fDe7GKmL7AvawF/4UQ3qqPrdcMtlG4xaWjZMHER8KqS17zz00Dwk9WiLMJgGgkkty7Bnew/bjMMvB2IlZ4a2lde82lpYzkgooMLsSFmeVW/vfN6jYsFZ1JCa9Cmr1x9IXk1f16ba9kcbXF8mCa1jVWt8qSWlpRhoibWoOdnIhsEASANnDosh8CKMQkMn+D+Dqi72bjfamY5j3vFmFQFa8L+kt53bw== 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=Z2W/yW0AH/KjUdQ9Xb9pAZLsisTrJjtT6MePQppSAbtHn3c0t71OXhLF4PlXluwmHbnqpXzYTm2m62BKLjgSEwavRll91zLa9GoUoLEVsKT3XceUTqpusyF2shDoZq2ZxfPmeLhVY1XTRLwKfT+kCrDx3886kvY70ol/FWvLXYGY0E+gZKuCmAZdnBAd3Nu/reRk4P1tCfJzt+LwMVF9r0w02AXllmtupQRUJBaVFI0arLGK1bDZQDTiepE32R5Gw9MxvvU01N7PizFYkABvOdDjhQk6i1/iSThdXCX6aaZm8L6zH6Fqy9gTVPCNZ4GdKdJtcXZ7UQ6aGeU6suuGEw== 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=N2xbeV9/KkFElEa9SKsVHLCWJV96+oYAViGrCZTEdVJkzEUdOLE/QrSnQcTogibX1DI92fIiXKFdYcGKN0zTGQHSdI18LtV7voKusJCZGxp51qadRWl/1uQl6vYcXIzJeL3McqDyi6RsI4vH7cr74Wic9UR2DUz8wC1RiVo38yQ= 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 (2603:10b6:805:63::18) by SA2PR11MB4860.namprd11.prod.outlook.com (2603:10b6:806:11b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Mon, 13 Sep 2021 13:02:31 +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 13:02:31 +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 v3 08/32] staging: wfx: take advantage of wfx_tx_queue_empty() Date: Mon, 13 Sep 2021 15:01:39 +0200 Message-Id: <20210913130203.1903622-9-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913130203.1903622-1-Jerome.Pouiller@silabs.com> References: <20210913130203.1903622-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR2P264CA0021.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::33) 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 PR2P264CA0021.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::33) 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 13:02:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc0e36de-de8e-401f-c24a-08d976b6bf62 X-MS-TrafficTypeDiagnostic: SA2PR11MB4860: 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: bUUGvWV1wbqaPvlu90FThUmw6/xngzHxEk1HRjzL492rhgnbejNDC8sejynd9B5TuIBFfjslvjX8FVZMG5sZNPw/sGt7mycn48Df8/BcWpQ3qVZFn7Ogi/XdfZQAVD/sqBUubMO2R18EofjGubBfFnaNFoU7Lri5YPPRLiyjwdqnUfqevCrqSVexezd2Uzlbiw+Crzbbam6cdfnkVvjjD6S0wJ5tVvXcN2SBynzSAczYiYdp9ur4GOGjITqPqxLWrzuU5yrXZZQ9uZR5B5AzwaNCGNXj+sVhTBccUdkVn7jrw39WOQuykJu123JtuRDtorVPtynnHwYH/WRbMH1G7g8woFCL8PTHT1jZTOK8GXi3z1V0XCgqsSXOIhTjltxI+M3j1hXZc/O7AXH5Iac09WoyKAp4vxXirq8uxjvbb7rPckRTZHj0I+A1FWFJ1W+qeaor3cOCZ6/s6Njxd3xbtjoA6jzhSRDlsqPgC4VhvH9QkzQdSzV8udk5ZuPYFpNO0iC06g+Gdhg46wCR/WzZDwDclksFuOJn7WWjms1zlJAuC/6LEJ7w49zIDLOv+rnL167NZEYdDUDu7n4WrSXRy5sePvtW9vmejacQ1xcHK4TRSugs1ImA49Wj2mIFOmVkwJ5XF3UBjDwiaFhPb9s2FNAOsdimyOV4j4HwKndVVvpf+dzcX592DwOAiMt/Vf/IMGxroonZ2AnXa1WF1cer3w== 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)(956004)(66574015)(66946007)(2616005)(26005)(36756003)(38100700002)(38350700002)(316002)(4326008)(107886003)(7696005)(54906003)(5660300002)(52116002)(66556008)(1076003)(66476007)(6486002)(508600001)(8936002)(83380400001)(86362001)(2906002)(8676002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?R2Foee6y9nluaIUwg/1SFVfgTRY4?= =?utf-8?q?tZ7DoXc6/aOIeonIyxCgzwOEmHPjunm2mVfVFBzN7AvglxrzT30cP2SLjN0Ga0E+6?= =?utf-8?q?yARRMt86NEFWnnP4j8U2i4b8ErSEn8ZHOSeHXLg/nTdaHynYlWoqTqTujlbdISPfg?= =?utf-8?q?NTlVJt66oi9g97+a5Vo35qzOl4iuqQGnfMczPi7Ty4fTyg1fxJOVPGiqPtLUZm4Zx?= =?utf-8?q?6Wlri9Ku+TEzDpkxBU8N1OcqqTHVbsphcE9A2fFDLFSGfXgf6zHkCj0a/h783Pzs2?= =?utf-8?q?zfRs2m4wF+JlCfBG6ua6rOCR6pohPpmqP9jYHOSQ4IJ+fNq+EAX10/fnOO23VHIWW?= =?utf-8?q?QIA7aBshudZOx5xjIOpSjSWJ9XvsrGzHFzXA5v+KzBDpsyPUJNW7ZSL/RmRkv7GvH?= =?utf-8?q?ryT4SpGqzomAAzcp8lP6Lbd/dZaZi13Su99zfQte/UgcxP2b7LKikataDj4um61+N?= =?utf-8?q?zOTmQfYhlAUlPp5l8dUeFx333MjO02miNFYf0I1qJtOJhr+Vc8VFrCTWRG7z0v3Rp?= =?utf-8?q?2+nHTaQotMH4d3hwVhCLo0B88YsMg3GH2MWalCxObzsqe/vI2X2FhFJW8Dci0nBnQ?= =?utf-8?q?RL5B2zq1aXiNgCRuNwG+/ee4FHQCKSC0PT6bBqJXLt2j7xAGAlWMUwweGZ3VHtFON?= =?utf-8?q?tilwgL82HLlkn8qlGPqa9Zu5DWw1oE7HVgfahH7Nlb5l04eu58A1YlwOMiTEfumUa?= =?utf-8?q?DhXzCi/FylWXcSy7rKpIT/+oYX004MSVz4fhvRbGRNiLyItz0O1BG+7OW733w0MzY?= =?utf-8?q?RLWomsBZ9Z5qfdKtSIz4P1y8CVCTYIkEa2mnZskYOgAyP1m7mZQJpH0ZLuI7w8B74?= =?utf-8?q?GBGm4D1DtBquedvbswuisopP2TPkes7lR6XXJbgZz2g4csKHYWSZFUIPgpRKMIeJK?= =?utf-8?q?T6CLc7QpLMP2SuztwtnzlSB3eZKJl0geT7jjSczlECMMYhDEOqw5eLGsfL1LzBX5N?= =?utf-8?q?SV9DF2Mi7p2oThcCHDZdl3idQAK8FhJ5UCj9+wpNcfTTcHsU3D8qV/Ur17HxobJwz?= =?utf-8?q?inNZw5bRe8uOruiXXLOepoi2V2gb8mfCRpIAw0okAiPlg3ODSFTbYd9yhz/XIVZfr?= =?utf-8?q?1w0Y2q+5s7ie0vIKcY6BqnftzoVtpJn0nSbZQG1QTrUrHkThfuxODBLs7epk6VGCm?= =?utf-8?q?WQU51lBWZahvoY2V8P/iMgH50Yvlyalvm3XlRE4vpcOs9uWzSYRzFKL0daYfC1dDB?= =?utf-8?q?/hVDT7Qr8grRu4oEfAgEhvYyJPvTXeqNXhw0sImGbh4R1NpOkEgrjXnb5uZI6yXCu?= =?utf-8?q?z9SdDsFSWO6MkZHu?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc0e36de-de8e-401f-c24a-08d976b6bf62 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 13:02:31.7651 (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: 7tGysRla1abGaPdGJM17r/1Y3pzxrLcLhN/WEGfMKmQm1WOfuiy5b120MPyPsq8/wyrxz7MXmHgXeSfMaQG8TQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4860 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)