From patchwork Sun Jan 8 18:57:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 40536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1816920wrt; Sun, 8 Jan 2023 11:03:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvVq/32et/cI9tSXzBWP2lGZ0WTo/R4IgmQ3vB2CZX8xJnwpnbhgxWCbJTPVulLwxLSm2z+ X-Received: by 2002:a17:906:2813:b0:829:59d5:e661 with SMTP id r19-20020a170906281300b0082959d5e661mr53016559ejc.29.1673204599730; Sun, 08 Jan 2023 11:03:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673204599; cv=none; d=google.com; s=arc-20160816; b=qPmHK29Jvn534LG4+UXGnAqj9B3Ke5lzBg7mY9QGa/8uLLHwU7hNUPNWvAazaRXbVL CxRr9xq4uiBs8fV/YmKoQSeTpdTqVK4r2xwt3CTKiGmU3+H64NBKtvtNLpnEI6GN0zL6 NlQ0Ve1cFT+j7jNZdhdi7FRnMX7Q9tTA/8eDtmuLm3XNoCpJAeV5lFrv7Dj3G8PccIMz KChi3tPsOBT4Dv50d8H29eHbSi7Bmo0XnxIL2MLNMblrEV7lUGSFm8jNjzkzbjednbik OFXHzbMf+nVfm7uDpl+gPZNGSGO8EcLhvPDDvexBAc4QaO5lW6tSsku+i8FuNMBWGWYA IDAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3o/Ts9oduFrCTAVGMbpJRARTF/ewErwjybP6BTnL44M=; b=z8k8eit6Fh0AiWH5ckaIndaKdeNr+EgLbEcABqpPgHZzpoXrY3bhT/uLy5nFCsHhhJ fiZrMgZXLNhlqOq59WDmSbBAFRxVuA36e0342BHiIrXYXw0rmfsno44vPOZjrs7ValZg tP9To/7ULqnVNhszao3QCOOmiTIMWn+MFCGbEbAfjwCMdlEoNfpC5rboYxONn4nopmMk sz/a+WJokYM+6RPuJGaWWp9yEnYMAENwFkAZLmyTSv/N8IQ6tkO3gWxQ4+3tldX1l1B4 XApM3zUzu5e2ynoO9N9H4F3OBG1O3owCKYTracPprrGnOJMBp9/bfLStadDyxtb5Xc82 YVkA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o5-20020a170906974500b007763cc7093csi7506142ejy.884.2023.01.08.11.02.56; Sun, 08 Jan 2023 11:03:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236435AbjAHS6V (ORCPT + 99 others); Sun, 8 Jan 2023 13:58:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbjAHS6A (ORCPT ); Sun, 8 Jan 2023 13:58:00 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E828E00D for ; Sun, 8 Jan 2023 10:57:59 -0800 (PST) Received: from dslb-188-096-147-053.188.096.pools.vodafone-ip.de ([188.96.147.53] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pEarh-0003b8-Bx; Sun, 08 Jan 2023 19:57:53 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 04/13] staging: r8188eu: voq_cnt is write-only Date: Sun, 8 Jan 2023 19:57:29 +0100 Message-Id: <20230108185738.597105-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230108185738.597105-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754482185993808971?= X-GMAIL-MSGID: =?utf-8?q?1754482185993808971?= voq_cnt in struct xmit_priv is initialised, incremented and decremented but never read. Remove voq_cnt and resulting dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 3 --- drivers/staging/r8188eu/include/rtw_xmit.h | 2 -- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 4 ---- 3 files changed, 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 1319a7fce8b3..8211b858573f 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -194,9 +194,6 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->txirp_cnt = 1; - /* per AC pending irp */ - pxmitpriv->voq_cnt = 0; - pxmitpriv->ack_tx = false; mutex_init(&pxmitpriv->ack_tx_mutex); rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index 71a7fb33b0d0..7e6cf745d913 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -281,8 +281,6 @@ struct xmit_priv { * 1->vi, 2->be, 3->bk. */ u8 txirp_cnt;/* */ struct tasklet_struct xmit_tasklet; - /* per AC pending irp */ - int voq_cnt; struct __queue free_xmitbuf_queue; struct __queue pending_xmitbuf_queue; u8 *pallocated_xmitbuf; diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index 7929b7d5e89e..6fe5a4230291 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -42,9 +42,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) struct xmit_priv *pxmitpriv = &padapter->xmitpriv; switch (pxmitbuf->flags) { - case VO_QUEUE_INX: - pxmitpriv->voq_cnt--; - break; case HIGH_QUEUE_INX: rtw_chk_hi_queue_cmd(padapter); break; @@ -106,7 +103,6 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem) switch (addr) { case VO_QUEUE_INX: - pxmitpriv->voq_cnt++; pxmitbuf->flags = VO_QUEUE_INX; break; case VI_QUEUE_INX: