From patchwork Mon Jan 9 21:28:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2392142wrt; Mon, 9 Jan 2023 13:34:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuqg+TBTO/WctZJ959Nh9EgxpuS4vceVXByr6UZi81eWZhZo6OrunjUSxZlIPmDnf5BEEpp X-Received: by 2002:a17:902:854a:b0:192:7a02:31a7 with SMTP id d10-20020a170902854a00b001927a0231a7mr56647267plo.49.1673300096374; Mon, 09 Jan 2023 13:34:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300096; cv=none; d=google.com; s=arc-20160816; b=OnMNJu0C2CmIKbxzjOqedcke3kYrnyxSGxe0ZJBRkoIrwMZ3O11M89O0z3Ptggu4T6 z7Yn6I4ox8Xz+65zd6yw+v1sBbyw1S2V4ur+9tfhTodg5KqB8l3uEUGguSgwDbi1kXPP qeQhqqW+HES5HdxoT0iFMRplqZpF7Wu18vtkK9X7M8N4dKDv+Ps2b8Ib/DyzJoct8wPf NuLrDs/Mheri7bEHudkgEeeQ4qGnZktVi0h47+kS9Fh31WqZ9qGyLh94VRD1rRVyOoDX A3HbWXGw/bur+d6thZmbxJFd160tioHO+vdL3UDxc9JRtZgA0iPiUhDHEzFqYaT1FZEE L9kQ== 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=LUvt5LHD6lszCbbeHdQsDWRaJW6uFNPTqo1QOrpr3c0=; b=SVFh9WCQ54BEv0E5hed4jpAqXSU5Gud69n/o2wkpyx+qznLOUqUrfQapShyLRt0hHJ 0LyETfN34JfO6FwxZcBFrS6IEbfo+AslWHRSdi24+US7DVYVkvLzVLN4CLBziwOJ1vI4 av/Dh83v2bTnVcrMdaCPxwtlgnEEqgsp6ypNf+mB5z5UiaIO0EklBdBcGTNZV9/8Un4S cMrMtbZQK4D6vN0KcQYB1RSnsWm71xec9fLO4eGUhttz2oo0LXGfcQc6AdGzhrUIOZGf YoJz4K9FDpPbsgma08q65zmH3hbPthHxVylLvL897KeU1iF9QgQ86/AiXTnDYm7nVOrB tE6w== 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 f9-20020a170902e98900b00186e9ff4edcsi9196532plb.408.2023.01.09.13.34.44; Mon, 09 Jan 2023 13:34:56 -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 S231290AbjAIV3o (ORCPT + 99 others); Mon, 9 Jan 2023 16:29:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237969AbjAIV3S (ORCPT ); Mon, 9 Jan 2023 16:29:18 -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 9DA49DFF9 for ; Mon, 9 Jan 2023 13:29:10 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhY-0007iD-Lx; Mon, 09 Jan 2023 22:29:04 +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 v2 01/12] staging: r8188eu: beq_cnt is write-only Date: Mon, 9 Jan 2023 22:28:41 +0100 Message-Id: <20230109212852.75612-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482281017983776?= X-GMAIL-MSGID: =?utf-8?q?1754582321807957374?= beq_cnt in struct xmit_priv is initialised, incremented and decremented but never read. Remove beq_cnt and resulting dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 1 - drivers/staging/r8188eu/include/rtw_xmit.h | 1 - drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 4 ---- 3 files changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index d224785a747b..e5ac49441337 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -195,7 +195,6 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->txirp_cnt = 1; /* per AC pending irp */ - pxmitpriv->beq_cnt = 0; pxmitpriv->bkq_cnt = 0; pxmitpriv->viq_cnt = 0; pxmitpriv->voq_cnt = 0; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index f8f10c67b764..c84f73f2cc59 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -282,7 +282,6 @@ struct xmit_priv { u8 txirp_cnt;/* */ struct tasklet_struct xmit_tasklet; /* per AC pending irp */ - int beq_cnt; int bkq_cnt; int viq_cnt; int voq_cnt; diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index 220e592b757c..067b7def2bde 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -48,9 +48,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) case VI_QUEUE_INX: pxmitpriv->viq_cnt--; break; - case BE_QUEUE_INX: - pxmitpriv->beq_cnt--; - break; case BK_QUEUE_INX: pxmitpriv->bkq_cnt--; break; @@ -123,7 +120,6 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem) pxmitbuf->flags = VI_QUEUE_INX; break; case BE_QUEUE_INX: - pxmitpriv->beq_cnt++; pxmitbuf->flags = BE_QUEUE_INX; break; case BK_QUEUE_INX: From patchwork Mon Jan 9 21:28:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391849wrt; Mon, 9 Jan 2023 13:34:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXtby//0k5mwwL5GDJkH3oAGXFAyXvxcz5+9RJYClHhCf0bQeWBfI5rr4sZUA/wc6dZ4N9TT X-Received: by 2002:a17:907:c70c:b0:81e:9027:dedc with SMTP id ty12-20020a170907c70c00b0081e9027dedcmr56795836ejc.39.1673300053539; Mon, 09 Jan 2023 13:34:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300053; cv=none; d=google.com; s=arc-20160816; b=fdssuBSCccBWpCefM3X4FFvJp2KFBKkCClIv4iWRsyQpwQ+RROep4YmxoU0uJOr5UY 5MhE3azlTLV2rGsKwmzbnyNE8OS3eceW7Kg0vmN77MvZHOWpcLpKA730GQsn8GdyjID2 5v36dcpGQezLiqFk7lHG7pKb1ezm6vnwGYWsFaKW0nf6VZP6t2UoqzTVkDvlbAa/Ffe1 50meep4kx4JEnlZ7S5T7c0At+RKVt0OHfLIhdkKE8Q2NTxRI3RStC4SJLcySrrsZg/MM y+o9km5w6i8zwQBcQyYGNaUG7v747LjyZjhTqV0KtHydgLg3vRlwwDh8G44rD6ZFfVhr vEmQ== 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=3VHIN37mdx1O10AoFulxGo7ZZaU4463DGS8VGSbOa80=; b=P8dq7JKUl73pH8of7vEB94n7ups/yDNxR2jQR7To+oS6fQoG7kQGobBvzM+iwgfUI8 ofBEomfBEM7s6nGxV9B2DNKcMERHsYLlkT/ErgC/S4xWHl82LuuKs4q4O23ASEHhcVLi 5B5WpFIVSdmj0E0uge0kvFgz7I49nyrjVnNfH7FHIJgeFvLQgR3NQ5DK5HcGIJfWZAyr tTjLf+IzZIKkuAptoc2XYLdmdYVRcB9YKM58V9O4RfbaFhcejpYcd1pev1M3u7BPldEG RoGlNdlW0xhjUHCs55BK3KFTH6QBHfzeYD311vW4t/Rt9AJY9LiTsbnfEPZxI+S5wAMg r/1w== 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 w1-20020a056402268100b0047026e8bb8bsi12209728edd.233.2023.01.09.13.33.50; Mon, 09 Jan 2023 13:34:13 -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 S237875AbjAIV3h (ORCPT + 99 others); Mon, 9 Jan 2023 16:29:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237958AbjAIV3S (ORCPT ); Mon, 9 Jan 2023 16:29:18 -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 8A38A6334 for ; Mon, 9 Jan 2023 13:29:10 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhZ-0007iD-HN; Mon, 09 Jan 2023 22:29:05 +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 v2 02/12] staging: r8188eu: bkq_cnt is write-only Date: Mon, 9 Jan 2023 22:28:42 +0100 Message-Id: <20230109212852.75612-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482221899707259?= X-GMAIL-MSGID: =?utf-8?q?1754582277165776851?= bkq_cnt in struct xmit_priv is initialised, incremented and decremented but never read. Remove bkq_cnt and resulting dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 1 - drivers/staging/r8188eu/include/rtw_xmit.h | 1 - drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 4 ---- 3 files changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index e5ac49441337..875675656d11 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -195,7 +195,6 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->txirp_cnt = 1; /* per AC pending irp */ - pxmitpriv->bkq_cnt = 0; pxmitpriv->viq_cnt = 0; pxmitpriv->voq_cnt = 0; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index c84f73f2cc59..3d56c3afaf7d 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -282,7 +282,6 @@ struct xmit_priv { u8 txirp_cnt;/* */ struct tasklet_struct xmit_tasklet; /* per AC pending irp */ - int bkq_cnt; int viq_cnt; int voq_cnt; struct __queue free_xmitbuf_queue; diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index 067b7def2bde..5ae09edf9174 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -48,9 +48,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) case VI_QUEUE_INX: pxmitpriv->viq_cnt--; break; - case BK_QUEUE_INX: - pxmitpriv->bkq_cnt--; - break; case HIGH_QUEUE_INX: rtw_chk_hi_queue_cmd(padapter); break; @@ -123,7 +120,6 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem) pxmitbuf->flags = BE_QUEUE_INX; break; case BK_QUEUE_INX: - pxmitpriv->bkq_cnt++; pxmitbuf->flags = BK_QUEUE_INX; break; case HIGH_QUEUE_INX: From patchwork Mon Jan 9 21:28:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391993wrt; Mon, 9 Jan 2023 13:34:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXtbWadpS8TdyAnfoKtAJDmJZ83A9/T4/FEU4e9mHnvjeGFpIQTzbqqLayiRdMtNOCxGDnpm X-Received: by 2002:a17:90a:f48b:b0:214:132a:2bea with SMTP id bx11-20020a17090af48b00b00214132a2beamr68226449pjb.4.1673300074225; Mon, 09 Jan 2023 13:34:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300074; cv=none; d=google.com; s=arc-20160816; b=ZHUMThvTgXZGcMVNQ2Aqa5lbgog4DC1GYhv86OjauKQv0Wtw9ZNhGyavHUeQIx2PAZ u9vSrxEA4crpTgerhNrIHzS6XFYK0lgKqGZ1gdQ1WmqIzUyh0hIDv9k8UIyYYkRoStYm CSx96cKZ6zvO9MKvjP9i0ysUfzE9hvj+TdWkLSzpCrXwWKflbYJfylok+PPRAiUbb/bV GaL5H0yfSv5h8pDL7Ujz5ELPjf9lecuc3zH+nGIswJ8t/OEK4ULJsoFNyzNlwWF3faIn YkAu46VZk6fesLSQKGS7TlzsIULytt0OECmqDkxsz5r4py1B1B5WlNIXJbSRqHh1I3wC kaHA== 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=CfPgYeYZAjB7Ggs1AxFI9UPI632K5V++hia1F6y2Pm4=; b=GOQ6/ioCjGKbZPlTR4abGQoP1GQrLXlS0TB44w14llKMUm+o/gvHh1VBHYOo1roeCA I1o7ljdmzR9g2RaH6CUIGDAD1W1H33t15FKw06X/WbAPnT92VPI9zwnTrPNOzZnuQa8k mITMyxgHUyxVnaDo+Xd+LYO8xAlmZQlPfyfC2tp03h47lmBDdtZbXLHoT22VOqIhJNhL OJg+VCrwu51vUH1xSLno3NN9kFRz3txhsD8FZXAfa0lef4GNL5gOiWaO2pIssopp4awT r99Sx+MtNYRH9VjVwh27BpbW9gOJuET6ppFhuAr7KHT5TJkNj7kJ3dEAlMtW4X+OG//O Yx7A== 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 pj5-20020a17090b4f4500b00226613377a2si10353185pjb.167.2023.01.09.13.34.21; Mon, 09 Jan 2023 13:34:34 -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 S238070AbjAIVa0 (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237397AbjAIV3T (ORCPT ); Mon, 9 Jan 2023 16:29:19 -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 80D3D2CA for ; Mon, 9 Jan 2023 13:29:12 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzha-0007iD-AA; Mon, 09 Jan 2023 22:29:06 +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 v2 03/12] staging: r8188eu: viq_cnt is write-only Date: Mon, 9 Jan 2023 22:28:43 +0100 Message-Id: <20230109212852.75612-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482170514263874?= X-GMAIL-MSGID: =?utf-8?q?1754582298791635288?= viq_cnt in struct xmit_priv is initialised, incremented and decremented but never read. Remove viq_cnt and resulting dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 1 - drivers/staging/r8188eu/include/rtw_xmit.h | 1 - drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 4 ---- 3 files changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 875675656d11..1319a7fce8b3 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -195,7 +195,6 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->txirp_cnt = 1; /* per AC pending irp */ - pxmitpriv->viq_cnt = 0; pxmitpriv->voq_cnt = 0; pxmitpriv->ack_tx = false; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index 3d56c3afaf7d..71a7fb33b0d0 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -282,7 +282,6 @@ struct xmit_priv { u8 txirp_cnt;/* */ struct tasklet_struct xmit_tasklet; /* per AC pending irp */ - int viq_cnt; int voq_cnt; struct __queue free_xmitbuf_queue; struct __queue pending_xmitbuf_queue; diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index 5ae09edf9174..7929b7d5e89e 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -45,9 +45,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) case VO_QUEUE_INX: pxmitpriv->voq_cnt--; break; - case VI_QUEUE_INX: - pxmitpriv->viq_cnt--; - break; case HIGH_QUEUE_INX: rtw_chk_hi_queue_cmd(padapter); break; @@ -113,7 +110,6 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem) pxmitbuf->flags = VO_QUEUE_INX; break; case VI_QUEUE_INX: - pxmitpriv->viq_cnt++; pxmitbuf->flags = VI_QUEUE_INX; break; case BE_QUEUE_INX: From patchwork Mon Jan 9 21:28:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391880wrt; Mon, 9 Jan 2023 13:34:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXtHmHKkVOx/NklfQaEBEDISNZx6uEMhW86jchuiDi5KDvTIgHge2EUUDbcb0qxTot/2hLsq X-Received: by 2002:a17:906:1e17:b0:84c:69f8:2ec2 with SMTP id g23-20020a1709061e1700b0084c69f82ec2mr39116885ejj.22.1673300059056; Mon, 09 Jan 2023 13:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300059; cv=none; d=google.com; s=arc-20160816; b=Mdq6mIRIxYI2HE0iq+Weuf8xNQJkclVRKnW5/EMbuDFRgpv4czrzN9lPbgZBpfi6QO 0bVc6hRyxS1YJBmY0pZ9mAqSjZGgnXsxQdVVgvqOcwKyAhSqS3qhGY2hldVnE0cMPXqU PRejsUB/8UmJsNLlbtIroRWYqrzwMdehqMndPN78TMJIxBIm9GBZtlOEUK/13Q5mrwo5 adZ0CLTmdJcMCekzM1IncIkowNV97rXbuxtfN14i6L9RvO1gOZeJ/gE3/73DrLceA4s+ oM7dLHl625R9I+Lw5xyc9Ws/UwqLfx0IwXu2reDG3tmNsoNuzKE88sR/6+sZKEAFiTRU iFCA== 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=kI4TT4R6DUz4zybB8IDC/uiB5SAy5HRgd+TzJp8nklv17/e1n/ismr2hjfxdJMRHAR iiukcZzdDQSus0WBTHo2JzUb/jofJdN8MLzKpM1bY5FIPdc7PEec8cT43h9IyHp+xRN5 UhiZSKv9fuLoba9mSGBW6U3ByWbcUZCFTu+0jxQh4f85qJK4Em3ZzjTvSPcWeKR01ojt qRMGxQidzmLYgbwMJFIete/fTAgAm6ZYY04WdcJNHrdQVZHwkqPCcpbJ3Tc1zL3sRLgl Nsa80bNpoRmOPeU5sanNUYjeFtbuIVGmHMfVrvMvUUfluRnB+ATo24dNRyhN1MubqFI3 8TQw== 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 ga30-20020a1709070c1e00b007c177fe6023si11743411ejc.256.2023.01.09.13.33.55; Mon, 09 Jan 2023 13:34: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 S237809AbjAIV36 (ORCPT + 99 others); Mon, 9 Jan 2023 16:29:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238064AbjAIV3T (ORCPT ); Mon, 9 Jan 2023 16:29:19 -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 3D99BDFDC for ; Mon, 9 Jan 2023 13:29:13 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhb-0007iD-31; Mon, 09 Jan 2023 22:29:07 +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 v2 04/12] staging: r8188eu: voq_cnt is write-only Date: Mon, 9 Jan 2023 22:28:44 +0100 Message-Id: <20230109212852.75612-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754582282764092178?= 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: From patchwork Mon Jan 9 21:28:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391933wrt; Mon, 9 Jan 2023 13:34:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXvujHZGdBb4oMYDeNjCbXQUV38u8aKZHWnU+9peSMn4CdCxgow1O0EYjsaKbmev6LrdWBtw X-Received: by 2002:aa7:d51a:0:b0:479:6c4f:40df with SMTP id y26-20020aa7d51a000000b004796c4f40dfmr59113536edq.18.1673300065168; Mon, 09 Jan 2023 13:34:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300065; cv=none; d=google.com; s=arc-20160816; b=bHjDei517CqZpSL9bzupxyBbvTFjTBHi/N9ryl7mHGXvWOpDgW34DayaaSSMvw0hwp RGuiojwbUZDCfakx4NlV1h+g1ZX3RARCSryJnUzp3gNLFI1vg585iHO1CSVrPFgNaRFd wWThk2wd+NfTaD2HfNAO+0mqwhSfaX+MAitH4HGmdxsTQn5Ufx7qScjLGfM2MoPF3n3Z 22uE7Gp/rHMYb/yEgd3ImunaX2vNz0jm11EneGV7C8OAyNVSmMesKlwQ4m07GqxHQKqa KAYjWdWrsgktPu8xXXREiJyG6aV3NGEvyxV4rU6SzjXd79SCpHji0DNqNnmoadtVqMEk Wktg== 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=6oOP7ilBexgfwk3Jyb0OkYMvM8WjBu93eowsRHI+rxc=; b=zhpU79zQ5OcZLYUO63xe62f4EqSoUich48AjGyXlV4CuFmW7imv3jGSRoJSChr1pHl GLH/BrXbSF7W+7Qz6m/1scp5Y6/nvY2l0nK6WSMmyNfhcNyDKHa0c6w4jBootf1z2yAm Ux/tnwOBz3tnVSzsyZJi1fXyZ5OV0XR2NnMz9DNHzJVoWUTLuwCdpVVArwurdMaGvL5d f2FHlnH9YsxGQEZvo6DeOjUzdIkfKIyhdlj1Q6jzrUn7uwHfFGOqGZ1iCqHBNHq8Un3A v9BU8qVDbXi0Rksa4FTp+PCIw7mXFPKO+C4kuE0tMka7oOOlxj29y3eC6UahIZr3D4+a Lh+w== 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 y90-20020a50bb63000000b00482b7282bdfsi8472666ede.89.2023.01.09.13.34.01; Mon, 09 Jan 2023 13:34:25 -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 S237726AbjAIVaN (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237985AbjAIV3T (ORCPT ); Mon, 9 Jan 2023 16:29:19 -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 3D8ECDF3A for ; Mon, 9 Jan 2023 13:29:12 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhb-0007iD-SY; Mon, 09 Jan 2023 22:29:07 +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 v2 05/12] staging: r8188eu: replace switch with if Date: Mon, 9 Jan 2023 22:28:45 +0100 Message-Id: <20230109212852.75612-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482248796762661?= X-GMAIL-MSGID: =?utf-8?q?1754582289243196667?= The switch statement in usb_write_port_complete has only one single case. Replace it with an if statement. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index 6fe5a4230291..257bcf496012 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -41,13 +41,8 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) struct adapter *padapter = pxmitbuf->padapter; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - switch (pxmitbuf->flags) { - case HIGH_QUEUE_INX: + if (pxmitbuf->flags == HIGH_QUEUE_INX) rtw_chk_hi_queue_cmd(padapter); - break; - default: - break; - } if (padapter->bSurpriseRemoved || padapter->bDriverStopped || padapter->bWritePortCancel) From patchwork Mon Jan 9 21:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391864wrt; Mon, 9 Jan 2023 13:34:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXt0ZX3YtiFrE9aImRRsy0SBhHF9+nSwcO0tFW7H4mYRmGE8k2AfoTHs0L1qRM6wjmLxUZrR X-Received: by 2002:a17:907:8b90:b0:84d:207d:c00c with SMTP id tb16-20020a1709078b9000b0084d207dc00cmr12517554ejc.25.1673300056710; Mon, 09 Jan 2023 13:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300056; cv=none; d=google.com; s=arc-20160816; b=odcI6p9QdLLMcc4Ol5zGBofOqFFFhPZiPGpXlw0/kZ9JYZR3rBku0o2vYqMVoxUmuV AM0QMDZ8ciU4DsD9Be125xSnKMl80VhcaogFt143YheO5bYYdVsmiTR/Dfu0wEVr7fm3 HhGogj9EUvLe0HTHVlCM/923vJCA8DhGlo8Kv6A9kh1PBWS4mcYvuxC8Z78jF1h59van qPgzBwVVyxx5TUVkHMJthu4D6LO/7qclEBkgO+pTLRVPggnMO6BqOcXnH3f3981NPirB 3I2auqek7MMlZ90lmSUz0h0pwuZoD7cTp7NcGpCP9xRqyqvpkLRkhnl2bUu5n8+5TvnC 08lQ== 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=w8e3f9MiQDynXs9Ob+peElZ7pOQAza+KiujRZsOB4lY=; b=Gbr7Fb+dmGuMrc530ShqLlmMp0BggzqISLJO9Pr275G+TUkj/dtt4hJDLFNfrYBr2p pBk/mmwXBp8yubWDwtI/XUDwOREoOc6CK8ngWub/A7PM42Ij507BD/GUaVglPPY2+wX8 iykJ0Un8kV3QNAqOZ94y6aoLz9rnQ0INMs8D2k/iDZaNLTMv8F5L52KBMI4GpxuX4pGw VpfasmUCfk8pdHlRtRUwmoqm9c6vHH6NN9zgcDcDKuyWZbZuA6g6XyFq1Y79MWc60UcN eL4r6DDu32qmaHWxpEyPS4s0fHBOj1G/htuQzGRUvvMLGJEZ4gsa0GskrWo4qQSDj+aR wQ2g== 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 i10-20020a170906264a00b007c195f5947fsi7357212ejc.1003.2023.01.09.13.33.53; Mon, 09 Jan 2023 13:34:16 -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 S237820AbjAIV3s (ORCPT + 99 others); Mon, 9 Jan 2023 16:29:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237860AbjAIV3V (ORCPT ); Mon, 9 Jan 2023 16:29:21 -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 B58ECE08B for ; Mon, 9 Jan 2023 13:29:14 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhc-0007iD-Ly; Mon, 09 Jan 2023 22:29:08 +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 v2 06/12] staging: r8188eu: dir_dev is unused Date: Mon, 9 Jan 2023 22:28:46 +0100 Message-Id: <20230109212852.75612-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482274690192981?= X-GMAIL-MSGID: =?utf-8?q?1754582280274057170?= dir_dev in struct adapter is not used by the r8188eu driver. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index 8fef5759c36a..4803d0c77d70 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -187,7 +187,6 @@ struct adapter { int bup; struct net_device_stats stats; struct iw_statistics iwstats; - struct proc_dir_entry *dir_dev;/* for proc directory */ int net_closed; u8 bFWReady; From patchwork Mon Jan 9 21:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391865wrt; Mon, 9 Jan 2023 13:34:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXtvEIkYj6wuHwKho+1akc8Qrxy4s/z+mwHcp7Tb0u8Ng6MaQXco0TXoiy0LG//uOC3MEgAP X-Received: by 2002:a05:6402:3201:b0:48e:a96c:fd64 with SMTP id g1-20020a056402320100b0048ea96cfd64mr25613179eda.25.1673300056926; Mon, 09 Jan 2023 13:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300056; cv=none; d=google.com; s=arc-20160816; b=XNDbHa8ylcTqMsPhju9UsUIM4nPL4LUInmFIXWs/y4SIOQh3oL+rRGPoj8QRcU6hSt rLqribdWFTSZoexV+yHrj1ssO+OGYetZzodSWy8gLo9Ql61iqRzG81kpaUIF/nfVTwCq sgAYkJgwaG5TvIUv58t58HKUSU0Afs7cMQi8U3aN7XwYQt/r1bKpFBcYP3srmMUb3rWS hE7FwDSOKm+V3ncHZkz9b57exPow8EcTqfk/gLNQDkhhpYAT/HxZEOxxqw3n2ZqmrYuf d6V75+Zy8a4MlG/Q84rdcMAxU9n+ZMd3WyCREYKtU2bsYT0nWyeVF74CU40iShhqu6BB 7i8A== 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=860iR02L4Tbmwy+I2/Ebfn/EV5xhfhk6sK1bI7u1JM8=; b=Th1C7qCxxjkiFIkRXE2oyYQknJjRA+/1FaWRiG+bc6kQSgAK7z2qSDU0uH6j+Oxndl aq35X/9imCvgazF5b8K8+e0oLuvQEJ/2p9tWqBAJYXHUeejEi8PJ5H3hX4rgexOn0+K5 xi3sfYTiaGSVoraBQZ0D5UwcDb69N+VDpMjQCy0SopuQOujDh5Tob7RAEsifad+gxeiv eM6o4mul4uidwZRfUaZcryxE2H3wROaejai3BXRrMKsv8wETrBLdbYqPmrCe0FsLBV9n g0EKFYhku/eMtjxSuxCv2SNFQqLrV04shVTxE2OVi0pzIq3iVrFiJwtzLHpMd4zrYBwm 3k+g== 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 m5-20020a056402430500b0046a8fe6d173si12263264edc.456.2023.01.09.13.33.53; Mon, 09 Jan 2023 13:34:16 -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 S237960AbjAIV3x (ORCPT + 99 others); Mon, 9 Jan 2023 16:29:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237558AbjAIV3W (ORCPT ); Mon, 9 Jan 2023 16:29:22 -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 B5D06F03E for ; Mon, 9 Jan 2023 13:29:14 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhd-0007iD-F1; Mon, 09 Jan 2023 22:29:09 +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 v2 07/12] staging: r8188eu: remove unused hal_xmit_handler define Date: Mon, 9 Jan 2023 22:28:47 +0100 Message-Id: <20230109212852.75612-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482542681672112?= X-GMAIL-MSGID: =?utf-8?q?1754582280599639541?= hal_xmit_handler is not used by the r8188eu driver. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtl8188e_xmit.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h index 82439f52b0c8..230ea191d256 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h +++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h @@ -134,7 +134,6 @@ void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *frame); s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *frame); s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter); -#define hal_xmit_handler rtl8188eu_xmit_buf_handler void rtl8188eu_xmit_tasklet(unsigned long priv); bool rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv); From patchwork Mon Jan 9 21:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391912wrt; Mon, 9 Jan 2023 13:34:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXsE/wOl4/OetRBkiWuaogpcY3LfqQ/tvVEqNXVh9WzQbf2zQwKb1XfucFQclwI1yA92arsc X-Received: by 2002:a17:907:2c6c:b0:828:7581:f01f with SMTP id ib12-20020a1709072c6c00b008287581f01fmr49892845ejc.23.1673300062354; Mon, 09 Jan 2023 13:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300062; cv=none; d=google.com; s=arc-20160816; b=PLWbqSseqxRbYydzxBJFcDe1DjZUKjtitpcuScUg2Y+IwWdGd6NW6wZQ93TP6+l6hi 2/b3bSjqeDNUQezlUgViif4V1nfTI1KnJFvlhAOdbNGTl+2G9/3LyswBo4dgRERf+QN8 KczSziDfUJlDxyQl2nlAGXKKbiCmF4JWrQ6KzOaqrHXugTtHGCFSlUkDm7BPxQHW/aLO kbeYhrqS7q/s1F1Rn9kUah8pmcg1LGbW3bgzl5nNlbDvoKaspGvV2FbyPjQKX1eJRsZc E9HUWGkZBYPsT59LTf7imNThKYbCzu39G9WAZursqNS4hqZelZ0VfHNdWADsMb+bfaHB bFng== 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=cMJ3ceXvxgPdEbPMxQqDRLI8Ognh9U7d/fpuwhuSCfE=; b=P5o7ew2mHs7G2z6UlPf7Hjt4qCa7p9QfHuMPax5XEfAZ8aEHNBBtHpP4rs3M6V5Zag BD61l03PeTf+tvx4rbCpSsJuzSZoSQ2djR7V0Xn065Ra5EHYRUHp3A9KNEUw4z5pQbpi d4qEIDW4X0oMK4+p23/8OfxnBWhKfxfQkktwS+iupKJ+E1go1UL2mI/0xyZp6qEt/E77 k4o01GDi53BvtWgBiJVUylWTssiwaboZlaK8x5WQz30LXHCm1jHBiHtwcA480m3LpNrm mKiwYFRz6RDTSWVBklWfViATt1s+NwlR82bxRRYDbK3kAUj+U0HxtiX6R1HOVrChZSAm fG8A== 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 hb8-20020a170907160800b0084d459379a1si4326118ejc.381.2023.01.09.13.33.57; Mon, 09 Jan 2023 13:34:22 -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 S235145AbjAIVaB (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231258AbjAIV3X (ORCPT ); Mon, 9 Jan 2023 16:29:23 -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 763C26258 for ; Mon, 9 Jan 2023 13:29:16 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhe-0007iD-8q; Mon, 09 Jan 2023 22:29:10 +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 v2 08/12] staging: r8188eu: txirp_cnt is write-only Date: Mon, 9 Jan 2023 22:28:48 +0100 Message-Id: <20230109212852.75612-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482531399476094?= X-GMAIL-MSGID: =?utf-8?q?1754582286548734525?= txirp_cnt in struct xmit_priv is initialised but never read. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 2 -- drivers/staging/r8188eu/include/rtw_xmit.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 8211b858573f..1cd560630de3 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -192,8 +192,6 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) for (i = 0; i < 4; i++) pxmitpriv->wmm_para_seq[i] = i; - pxmitpriv->txirp_cnt = 1; - 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 7e6cf745d913..50d9311d3e40 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -279,7 +279,6 @@ struct xmit_priv { u8 wmm_para_seq[4];/* sequence for wmm ac parameter strength * from large to small. it's value is 0->vo, * 1->vi, 2->be, 3->bk. */ - u8 txirp_cnt;/* */ struct tasklet_struct xmit_tasklet; struct __queue free_xmitbuf_queue; struct __queue pending_xmitbuf_queue; From patchwork Mon Jan 9 21:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2392211wrt; Mon, 9 Jan 2023 13:35:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXtGW4Epb0riZu4PAhq58Dm4/MbPbWXd11zVahBLjcPkNu2VtRng3YSxfd8k22sYfZzHOszE X-Received: by 2002:a17:903:189:b0:189:ba1f:b178 with SMTP id z9-20020a170903018900b00189ba1fb178mr107465174plg.9.1673300109177; Mon, 09 Jan 2023 13:35:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300109; cv=none; d=google.com; s=arc-20160816; b=dd+UWhf6h6C5hmQYPETDrh5PHoaBpgakiM5Z+I+9+4vA0Q6pCzdJ0qqAHPl3gBrhF6 v2HKykfWhHB03OANTD9ZMi1IdieXTBFHyzgdCEJYPcj1vzWx4uOiCg92WIas5r3T71kt RbsuJDUvVe8KNO0Laq9f4IK24RJIbRcgFKII0IzluCp0gWB2xzkq+yCmghhs+76C10x4 M9rQygt4Fvnegd3TwkP36yYjDA+0ae3yci+mOw+7VOa1UcvPR1ujbD8MKNyEAAfnVCVY DV8Qq9coMjrPaENUklyIt4Fkc29NhNobMFc7oCAWEE91kLZ3XyTK0AwJ8dT+OgyOsTX6 7+kg== 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=zmj6B4W2C19ewXOE/HN08ZvPB2GISpNLc553x9MAYSo=; b=KBa0qYqWGaFpZSGdH4CQ6+wIfENG6xFFU+K/vuseGFg5pjm8g0zTtEXo6IxBOLlLcs CykNfXNwT6gEdxTLmk8i+VfxTUkaXwBhaHZnTelGZyv06PrzIq2izgxYtf78pL90lAO7 4Kqx8G2/ZduOdk6aHbJj0bZB/8E0Mk0pm1UNvqtGdXIAE41fqNKFD0TRhr3NGRL2c6pQ 0hwXM0M7pXbo7RxxSFlfXTE9kJzC3udwUT87VCttxQqy3fPxIjiaiEW+hjOrtc1DSyQM 7Y8Y58CYfdFOChg5b2dXgXpCm44iR2JkNM7ePpN0vxjl9kmxjm2lydy3O4SpbavbU7Og HqdQ== 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 r2-20020a170902e3c200b001932b865086si4441179ple.226.2023.01.09.13.34.56; Mon, 09 Jan 2023 13:35:09 -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 S231310AbjAIVaR (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235396AbjAIV3X (ORCPT ); Mon, 9 Jan 2023 16:29:23 -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 0AF7310568 for ; Mon, 9 Jan 2023 13:29:16 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhf-0007iD-3D; Mon, 09 Jan 2023 22:29:11 +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 v2 09/12] staging: r8188eu: remove unused QSLT defines Date: Mon, 9 Jan 2023 22:28:49 +0100 Message-Id: <20230109212852.75612-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482337162099300?= X-GMAIL-MSGID: =?utf-8?q?1754582335229578294?= Remove unused defines for Queue Select Value in TxDesc. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtl8188e_xmit.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h index 230ea191d256..e6d343ffc148 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h +++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h @@ -5,17 +5,7 @@ #define __RTL8188E_XMIT_H__ #define MAX_TX_AGG_PACKET_NUMBER 0xFF -/* */ -/* Queue Select Value in TxDesc */ -/* */ -#define QSLT_BK 0x2/* 0x01 */ -#define QSLT_BE 0x0 -#define QSLT_VI 0x5/* 0x4 */ -#define QSLT_VO 0x7/* 0x6 */ -#define QSLT_BEACON 0x10 -#define QSLT_HIGH 0x11 #define QSLT_MGNT 0x12 -#define QSLT_CMD 0x13 /* For 88e early mode */ #define SET_EARLYMODE_PKTNUM(__paddr, __value) \ From patchwork Mon Jan 9 21:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2392465wrt; Mon, 9 Jan 2023 13:35:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXs8GO4ReBVgk2THo5sEU9+cq/0c+y1iANx1w247UqbwYKgJG4xkimLe2a1XmEfZfYdvK+Qx X-Received: by 2002:a05:6a20:8346:b0:a7:8ce5:6fc6 with SMTP id z6-20020a056a20834600b000a78ce56fc6mr62645280pzc.13.1673300151178; Mon, 09 Jan 2023 13:35:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300151; cv=none; d=google.com; s=arc-20160816; b=vZWJZDJc4omOyWltPVcI4534ZtujrFSv0bpaXAUiWhaFjrz1vth9jiGK/yRbUwNznY 6D36r0Q9yd4+owboq+kXp+dBFRhtfQaXJHASw//Yh68mptBMNsFGCW5C+0X0kOoZwqa0 mlQby9nuMCJYyxv7ySAI1xO+PlQYpnenbbm2qjXVo9Yx4EgpXEVWKmaQNzprW+pdvDpa QOrhY2ocbPAu6cYayr6W696mwbhnKuhisarwW1Y8gEUpzZtt1mZKVdcBGSx7UNz8bYoq uiEiHiKvgklBOCIh+BMjg8EmBZMoOjrwPHYdE8R1dFlvEEQlFJhQYU7/7ebII4yb+RIP bHfQ== 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=JX6LmtZgJ53Yaz7p87fAJxDajWoCqryVHDcRom3VzTE=; b=GHPWttPKc1opzMirkedrYtECz6H4wpCSRJEh/PkY1cd206KyUu2LuH0ud/shIr5Vo2 VrbIW2m/+GTFCbpgA/7UuM1hg/BddVbeAus4lJ3N7RYQdLEf7dUucSREaCbgEiK5Didy 3Fw0WqVCw0jCbY3iuL1J5w+ZrUuD6skyWw7y5xd1aBjGbb7MccKRyvvKX5rkU+nFF1jy i1wdpS98MNbG9DhlwpEh/R985W6wlzTW8buNOMFXWv5NvBZ1LwIDrvQo3Vu32Cfeb88A +rBwCx4RXe3pOjbsOnxnieqqJyL8i0P9E9oNPFUMnGPiaNdrXV5P4GXCVnDhbdQ1ZYzq X/Ag== 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 f9-20020a639c09000000b0047943c39fc2si10346205pge.160.2023.01.09.13.35.38; Mon, 09 Jan 2023 13:35:51 -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 S237858AbjAIVaG (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234229AbjAIV3X (ORCPT ); Mon, 9 Jan 2023 16:29:23 -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 EB5E1EE3C for ; Mon, 9 Jan 2023 13:29:16 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhf-0007iD-Tj; Mon, 09 Jan 2023 22:29:11 +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 v2 10/12] staging: r8188eu: xmit_priv's vcs_type is not used Date: Mon, 9 Jan 2023 22:28:50 +0100 Message-Id: <20230109212852.75612-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482228503280732?= X-GMAIL-MSGID: =?utf-8?q?1754582379159406369?= The vcs_type component of struct xmit_priv is not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_xmit.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index 50d9311d3e40..77d79c43209f 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -269,7 +269,6 @@ struct xmit_priv { struct adapter *adapter; u8 vcs_setting; u8 vcs; - u8 vcs_type; u64 tx_bytes; u64 tx_pkts; u64 tx_drop; diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index 2f59bb994796..ae03d39de092 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -394,7 +394,6 @@ static void rtw_init_default_value(struct adapter *padapter) /* xmit_priv */ pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense; pxmitpriv->vcs = pregistrypriv->vcs_type; - pxmitpriv->vcs_type = pregistrypriv->vcs_type; pxmitpriv->frag_len = pregistrypriv->frag_thresh; /* mlme_priv */ From patchwork Mon Jan 9 21:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2391975wrt; Mon, 9 Jan 2023 13:34:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXszu7bTxXqRCNZCl6fUUplzZA2e7vKefT6KyfQyw7LWed4QWrxDvw6gwuRclcISaPG29cNu X-Received: by 2002:a17:902:b098:b0:192:fb0d:84e8 with SMTP id p24-20020a170902b09800b00192fb0d84e8mr16377828plr.38.1673300070345; Mon, 09 Jan 2023 13:34:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300070; cv=none; d=google.com; s=arc-20160816; b=COanNm6ijyYRMYdX/h8lf0ER3IwaXTDuLQ6NCssmmsSjGioKdSPKGoJJmYz28Fkpbv wByF+NquZul/N9EsDSTSsoHS00ZOieVuHvzQ3Lro9F5wg/GFnXiCN3l+HTIaNNjpwzm6 LOc9jAX3WoPtU71XdIClPwiUjdXAfPjJlUcuSieqPjsr4pH5T97H0pEs32/svDVhDWF4 Wu6yMUFKnkYjufARCggAgX5eG5mmXlDqbQ2aH2a0zKwVM2PFAsRlwAgQFCe3Hzkn2P7X 0FnZQZWpKZ89eWf1CXF0JwAaJJispYJb4PpG9n/+JHCCBIlZsLXRpBnasrHHg1guVVEe N/UQ== 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=SFilvH1g/Bb+qK7QsmXseOAddGVaE8m9tWzulwv+2ZM=; b=yNMZPTBtToWw81c7qqlG1iWYetY+7UPLdamIQLNHewDjbsvTwj/kwGkzvzBdJxk5xj 8j1zhNLlwWULFgqwjI7nXOXUOSlFHcHA1OakPjSkNkPnusuKqME3eOLcD3pZ2cZu3262 h1ev9CLPq8aC9L3OHwJw6aEeTMP4npE7890tqGx1yss4/E8HL/bPTrp2MFJ3llzhDhFj z1HlLJRcMhXwmFw5Ro0/WI+RVQixTHS3605lYyNF71el8ock0mdQwADuq/KpsANxY08v VIFvn67s77BBp0HOi2dKxlvCK4XsHJqPaC001V4KzkObyVgOBuj/MKexLdQ6av+jVu28 uZmw== 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 f19-20020a170902e99300b00178b95aa01fsi9354307plb.614.2023.01.09.13.34.16; Mon, 09 Jan 2023 13:34:30 -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 S238053AbjAIVaV (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237345AbjAIV3X (ORCPT ); Mon, 9 Jan 2023 16:29:23 -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 D0F251145A for ; Mon, 9 Jan 2023 13:29:17 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhg-0007iD-Oo; Mon, 09 Jan 2023 22:29:12 +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 v2 11/12] staging: r8188eu: xmit_priv's vcs is not used Date: Mon, 9 Jan 2023 22:28:51 +0100 Message-Id: <20230109212852.75612-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482309541555366?= X-GMAIL-MSGID: =?utf-8?q?1754582294573811099?= The vcs component in struct xmit_priv is set but not used. We can remove vcs and the rtw_update_protection function, whose only job is to set vcs. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme.c | 5 ---- drivers/staging/r8188eu/core/rtw_xmit.c | 34 ---------------------- drivers/staging/r8188eu/include/rtw_xmit.h | 2 -- drivers/staging/r8188eu/os_dep/os_intfs.c | 1 - 4 files changed, 42 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index b272123626ac..fb7d0e161fdd 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -444,8 +444,6 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex if (check_fwstate(pmlmepriv, _FW_LINKED) && is_same_network(&pmlmepriv->cur_network.network, pnetwork)) { update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(struct ndis_802_11_fixed_ie), - pmlmepriv->cur_network.network.IELength); } } @@ -1027,9 +1025,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net break; } - rtw_update_protection(padapter, (cur_network->network.IEs) + - sizeof(struct ndis_802_11_fixed_ie), - (cur_network->network.IELength)); rtw_update_ht_cap(padapter, cur_network->network.IEs, cur_network->network.IELength); } diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 1cd560630de3..8b055e3fbfa5 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1099,40 +1099,6 @@ s32 rtw_put_snap(u8 *data, u16 h_proto) return SNAP_SIZE + sizeof(u16); } -void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len) -{ - uint protection; - u8 *perp; - int erp_len; - struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - struct registry_priv *pregistrypriv = &padapter->registrypriv; - - switch (pxmitpriv->vcs_setting) { - case DISABLE_VCS: - pxmitpriv->vcs = NONE_VCS; - break; - case ENABLE_VCS: - break; - case AUTO_VCS: - default: - perp = rtw_get_ie(ie, _ERPINFO_IE_, &erp_len, ie_len); - if (!perp) { - pxmitpriv->vcs = NONE_VCS; - } else { - protection = (*(perp + 2)) & BIT(1); - if (protection) { - if (pregistrypriv->vcs_type == RTS_CTS) - pxmitpriv->vcs = RTS_CTS; - else - pxmitpriv->vcs = CTS_TO_SELF; - } else { - pxmitpriv->vcs = NONE_VCS; - } - } - break; - } -} - void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz) { struct sta_info *psta = NULL; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index 77d79c43209f..abac0103b53a 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -268,7 +268,6 @@ struct xmit_priv { uint frag_len; struct adapter *adapter; u8 vcs_setting; - u8 vcs; u64 tx_bytes; u64 tx_pkts; u64 tx_drop; @@ -311,7 +310,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz); -void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len); s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib); s32 rtw_put_snap(u8 *data, u16 h_proto); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index ae03d39de092..f022f6b1cf3e 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -393,7 +393,6 @@ static void rtw_init_default_value(struct adapter *padapter) /* xmit_priv */ pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense; - pxmitpriv->vcs = pregistrypriv->vcs_type; pxmitpriv->frag_len = pregistrypriv->frag_thresh; /* mlme_priv */ From patchwork Mon Jan 9 21:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 41164 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2392010wrt; Mon, 9 Jan 2023 13:34:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXsEabXHS4mmrI7vFmr6YRsFkEnhAi9+3sVNyoUNvdPG3d6j0yYnnZ1XxGXn4LT7eK9ennpo X-Received: by 2002:a05:6a21:32a5:b0:a4:93ca:a2d with SMTP id yt37-20020a056a2132a500b000a493ca0a2dmr114031242pzb.49.1673300077346; Mon, 09 Jan 2023 13:34:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673300077; cv=none; d=google.com; s=arc-20160816; b=SofmqMK18bC7vA97/TCjL06R7GEYvRevkjDQy0YIZkH/z5tNf5YNjSzcp+4ZmQ+ySb JkndOwNQf15nt8mZA3iIXABpbvk28X5MP72F8FkA/N/zx/94AEWdKot6nhUmMXxLKuyg bFYCgbhA6sxYx8hd7CsVbdDLVuPppTARzP57WAnnCP+r99iweJLnOTjRUstSVIeMMbYN jPIo893lARwM5XwOuQsCmUjWK5hLBGfmyyUPtDKNruJJyepiI/REHBHuUxJQT8NDx9QX GXjI86Up4qExFa0gqlFz+KjWcNbat48I79eew9SYY6HFKB0uHjTEi/o/rsFEa9iAXdg4 ydrw== 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=8vWQjTzm22O7iAga3cSFZ8jnabS+zthzUpWQ5codcZA=; b=E9cjUAp2M1V68xNHb5RLJlISokGxZeTaObBtOTMw512+/j0F/5IO+nRWory/92EETQ NWmzkilnB9PgQ/5rQPGlMMUyrCNvArDiKvV9uqxFTEW1rFRzPRV6TkmVo4FRgZxYaN+R oq5OXYMnyZT6aZFx6LoMEZHVZhjrdTsij1vFdIDygb9eoQbvVXCbLg7Ge62B7Y8kJcRv gOcPKpBetLOdhshBV+hiHZIVjyCDjhuO/FE7WXdOlAX7EDwL9y6dg03SPcdOO6g630Bz EmLRjEcN3WES95EeLESa1ZpANP6Y+/mmaPE7X+vjqX8cnH4CjGDavY+h4s9WLUharM1z es7Q== 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 m4-20020a6545c4000000b00487fa650674si10195692pgr.788.2023.01.09.13.34.24; Mon, 09 Jan 2023 13:34:37 -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 S237987AbjAIVac (ORCPT + 99 others); Mon, 9 Jan 2023 16:30:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238034AbjAIV3X (ORCPT ); Mon, 9 Jan 2023 16:29:23 -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 8A075305 for ; Mon, 9 Jan 2023 13:29:18 -0800 (PST) Received: from dslb-188-096-147-178.188.096.pools.vodafone-ip.de ([188.96.147.178] 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 1pEzhh-0007iD-LU; Mon, 09 Jan 2023 22:29:13 +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 v2 12/12] staging: r8188eu: xmit_priv's vcs_setting is not used Date: Mon, 9 Jan 2023 22:28:52 +0100 Message-Id: <20230109212852.75612-13-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230109212852.75612-1-martin@kaiser.cx> References: <20230108185738.597105-1-martin@kaiser.cx> <20230109212852.75612-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?1754482531655950467?= X-GMAIL-MSGID: =?utf-8?q?1754582301663333697?= vcs_setting in struct xmit_priv is not used any more. We can remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_xmit.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index abac0103b53a..cc32167fb4dc 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -267,7 +267,6 @@ struct xmit_priv { struct __queue free_xmit_queue; uint frag_len; struct adapter *adapter; - u8 vcs_setting; u64 tx_bytes; u64 tx_pkts; u64 tx_drop; diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index f022f6b1cf3e..cfc24420e70c 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -392,7 +392,6 @@ static void rtw_init_default_value(struct adapter *padapter) struct security_priv *psecuritypriv = &padapter->securitypriv; /* xmit_priv */ - pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense; pxmitpriv->frag_len = pregistrypriv->frag_thresh; /* mlme_priv */