From nobody Tue Jun 23 12:19:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9731AC433FE for ; Sat, 5 Mar 2022 14:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231855AbiCEOmd (ORCPT ); Sat, 5 Mar 2022 09:42:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231623AbiCEOma (ORCPT ); Sat, 5 Mar 2022 09:42:30 -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 E0E426929A for ; Sat, 5 Mar 2022 06:41:40 -0800 (PST) Received: from dslb-084-059-247-134.084.059.pools.vodafone-ip.de ([84.59.247.134] 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 1nQVbE-0007ms-Mh; Sat, 05 Mar 2022 15:41:36 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 1/5] staging: r8188eu: remove tmp variable in update_recvframe_attrib_88e Date: Sat, 5 Mar 2022 15:41:13 +0100 Message-Id: <20220305144117.1380534-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220305144117.1380534-1-martin@kaiser.cx> References: <20220305144117.1380534-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove an unnecessary temporary variable in update_recvframe_attrib_88e. We can use the prxstat pointer directly to parse the input data. There's no need to store a local copy in "report". Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 52 ++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index 101091342e4e..ad5cbf0942fb 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -58,62 +58,54 @@ void rtl8188e_process_phy_info(struct adapter *padapter= , void *prframe) void update_recvframe_attrib_88e(struct recv_frame *precvframe, struct rec= v_stat *prxstat) { struct rx_pkt_attrib *pattrib; - struct recv_stat report; - - report.rxdw0 =3D prxstat->rxdw0; - report.rxdw1 =3D prxstat->rxdw1; - report.rxdw2 =3D prxstat->rxdw2; - report.rxdw3 =3D prxstat->rxdw3; - report.rxdw4 =3D prxstat->rxdw4; - report.rxdw5 =3D prxstat->rxdw5; =20 pattrib =3D &precvframe->attrib; memset(pattrib, 0, sizeof(struct rx_pkt_attrib)); =20 - pattrib->crc_err =3D (u8)((le32_to_cpu(report.rxdw0) >> 14) & 0x1);/* u8)= prxreport->crc32; */ + pattrib->crc_err =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 14) & 0x1);/* u= 8)prxreport->crc32; */ =20 /* update rx report to recv_frame attribute */ - pattrib->pkt_rpt_type =3D (u8)((le32_to_cpu(report.rxdw3) >> 14) & 0x3);/= * prxreport->rpt_sel; */ + pattrib->pkt_rpt_type =3D (u8)((le32_to_cpu(prxstat->rxdw3) >> 14) & 0x3)= ;/* prxreport->rpt_sel; */ =20 if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { /* Normal rx packet */ - pattrib->pkt_len =3D (u16)(le32_to_cpu(report.rxdw0) & 0x00003fff);/* u1= 6)prxreport->pktlen; */ - pattrib->drvinfo_sz =3D (u8)((le32_to_cpu(report.rxdw0) >> 16) & 0xf) * = 8;/* u8)(prxreport->drvinfosize << 3); */ + pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x00003fff);/* = u16)prxreport->pktlen; */ + pattrib->drvinfo_sz =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) = * 8;/* u8)(prxreport->drvinfosize << 3); */ =20 - pattrib->physt =3D (u8)((le32_to_cpu(report.rxdw0) >> 26) & 0x1);/* u8)= prxreport->physt; */ + pattrib->physt =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1);/* u= 8)prxreport->physt; */ =20 - pattrib->bdecrypted =3D (le32_to_cpu(report.rxdw0) & BIT(27)) ? 0 : 1;/*= u8)(prxreport->swdec ? 0 : 1); */ - pattrib->encrypt =3D (u8)((le32_to_cpu(report.rxdw0) >> 20) & 0x7);/* u8= )prxreport->security; */ + pattrib->bdecrypted =3D (le32_to_cpu(prxstat->rxdw0) & BIT(27)) ? 0 : 1;= /* u8)(prxreport->swdec ? 0 : 1); */ + pattrib->encrypt =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7);/* = u8)prxreport->security; */ =20 - pattrib->qos =3D (le32_to_cpu(report.rxdw0) >> 23) & 0x1;/* prxreport->q= os; */ - pattrib->priority =3D (u8)((le32_to_cpu(report.rxdw1) >> 8) & 0xf);/* u8= )prxreport->tid; */ + pattrib->qos =3D (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1;/* prxreport-= >qos; */ + pattrib->priority =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf);/* = u8)prxreport->tid; */ =20 - pattrib->amsdu =3D (u8)((le32_to_cpu(report.rxdw1) >> 13) & 0x1);/* u8)p= rxreport->amsdu; */ + pattrib->amsdu =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1);/* u8= )prxreport->amsdu; */ =20 - pattrib->seq_num =3D (u16)(le32_to_cpu(report.rxdw2) & 0x00000fff);/* u1= 6)prxreport->seq; */ - pattrib->frag_num =3D (u8)((le32_to_cpu(report.rxdw2) >> 12) & 0xf);/* u= 8)prxreport->frag; */ - pattrib->mfrag =3D (u8)((le32_to_cpu(report.rxdw1) >> 27) & 0x1);/* u8)p= rxreport->mf; */ - pattrib->mdata =3D (u8)((le32_to_cpu(report.rxdw1) >> 26) & 0x1);/* u8)p= rxreport->md; */ + pattrib->seq_num =3D (u16)(le32_to_cpu(prxstat->rxdw2) & 0x00000fff);/* = u16)prxreport->seq; */ + pattrib->frag_num =3D (u8)((le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf);/*= u8)prxreport->frag; */ + pattrib->mfrag =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1);/* u8= )prxreport->mf; */ + pattrib->mdata =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1);/* u8= )prxreport->md; */ =20 - pattrib->mcs_rate =3D (u8)(le32_to_cpu(report.rxdw3) & 0x3f);/* u8)prxre= port->rxmcs; */ - pattrib->rxht =3D (u8)((le32_to_cpu(report.rxdw3) >> 6) & 0x1);/* u8)prx= report->rxht; */ + pattrib->mcs_rate =3D (u8)(le32_to_cpu(prxstat->rxdw3) & 0x3f);/* u8)prx= report->rxmcs; */ + pattrib->rxht =3D (u8)((le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1);/* u8)p= rxreport->rxht; */ =20 - pattrib->icv_err =3D (u8)((le32_to_cpu(report.rxdw0) >> 15) & 0x1);/* u8= )prxreport->icverr; */ - pattrib->shift_sz =3D (u8)((le32_to_cpu(report.rxdw0) >> 24) & 0x3); + pattrib->icv_err =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1);/* = u8)prxreport->icverr; */ + pattrib->shift_sz =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3); } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT1) { /* CCX */ pattrib->pkt_len =3D TX_RPT1_PKT_LEN; pattrib->drvinfo_sz =3D 0; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT2) { /* TX RPT */ - pattrib->pkt_len =3D (u16)(le32_to_cpu(report.rxdw0) & 0x3FF);/* Rx leng= th[9:0] */ + pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x3FF);/* Rx le= ngth[9:0] */ pattrib->drvinfo_sz =3D 0; =20 /* */ /* Get TX report MAC ID valid. */ /* */ - pattrib->MacIDValidEntry[0] =3D le32_to_cpu(report.rxdw4); - pattrib->MacIDValidEntry[1] =3D le32_to_cpu(report.rxdw5); + pattrib->MacIDValidEntry[0] =3D le32_to_cpu(prxstat->rxdw4); + pattrib->MacIDValidEntry[1] =3D le32_to_cpu(prxstat->rxdw5); =20 } else if (pattrib->pkt_rpt_type =3D=3D HIS_REPORT) { /* USB HISR RPT */ - pattrib->pkt_len =3D (u16)(le32_to_cpu(report.rxdw0) & 0x00003fff);/* u1= 6)prxreport->pktlen; */ + pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x00003fff);/* = u16)prxreport->pktlen; */ } } =20 --=20 2.30.2 From nobody Tue Jun 23 12:19:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2BA6C433F5 for ; Sat, 5 Mar 2022 14:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231864AbiCEOmf (ORCPT ); Sat, 5 Mar 2022 09:42:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231834AbiCEOmb (ORCPT ); Sat, 5 Mar 2022 09:42:31 -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 295EE4348A for ; Sat, 5 Mar 2022 06:41:42 -0800 (PST) Received: from dslb-084-059-247-134.084.059.pools.vodafone-ip.de ([84.59.247.134] 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 1nQVbF-0007ms-Md; Sat, 05 Mar 2022 15:41:37 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/5] staging: r8188eu: summarize declaration and assignment Date: Sat, 5 Mar 2022 15:41:14 +0100 Message-Id: <20220305144117.1380534-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220305144117.1380534-1-martin@kaiser.cx> References: <20220305144117.1380534-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Summarize the declaration of pattrib and the assignment in the following line. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index ad5cbf0942fb..aee6b8c23811 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -57,9 +57,7 @@ void rtl8188e_process_phy_info(struct adapter *padapter, = void *prframe) =20 void update_recvframe_attrib_88e(struct recv_frame *precvframe, struct rec= v_stat *prxstat) { - struct rx_pkt_attrib *pattrib; - - pattrib =3D &precvframe->attrib; + struct rx_pkt_attrib *pattrib =3D &precvframe->attrib; memset(pattrib, 0, sizeof(struct rx_pkt_attrib)); =20 pattrib->crc_err =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 14) & 0x1);/* u= 8)prxreport->crc32; */ --=20 2.30.2 From nobody Tue Jun 23 12:19:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AD52C433EF for ; Sat, 5 Mar 2022 14:41:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231872AbiCEOmh (ORCPT ); Sat, 5 Mar 2022 09:42:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbiCEOmb (ORCPT ); Sat, 5 Mar 2022 09:42:31 -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 76BD06929A for ; Sat, 5 Mar 2022 06:41:42 -0800 (PST) Received: from dslb-084-059-247-134.084.059.pools.vodafone-ip.de ([84.59.247.134] 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 1nQVbG-0007ms-Fk; Sat, 05 Mar 2022 15:41:38 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/5] staging: r8188eu: don't initialize drvinfo_sz to 0 Date: Sat, 5 Mar 2022 15:41:15 +0100 Message-Id: <20220305144117.1380534-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220305144117.1380534-1-martin@kaiser.cx> References: <20220305144117.1380534-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In update_recvframe_attrib_88e, there's an initial memset which sets all of pattrib to 0. There's no need to set pattrib->drvinfo_sz =3D 0 again later. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index aee6b8c23811..6b83d7e80ad9 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -91,10 +91,8 @@ void update_recvframe_attrib_88e(struct recv_frame *prec= vframe, struct recv_stat pattrib->shift_sz =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3); } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT1) { /* CCX */ pattrib->pkt_len =3D TX_RPT1_PKT_LEN; - pattrib->drvinfo_sz =3D 0; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT2) { /* TX RPT */ pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x3FF);/* Rx le= ngth[9:0] */ - pattrib->drvinfo_sz =3D 0; =20 /* */ /* Get TX report MAC ID valid. */ --=20 2.30.2 From nobody Tue Jun 23 12:19:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8088C433F5 for ; Sat, 5 Mar 2022 14:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231879AbiCEOmj (ORCPT ); Sat, 5 Mar 2022 09:42:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231852AbiCEOmd (ORCPT ); Sat, 5 Mar 2022 09:42:33 -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 5D5C16929A for ; Sat, 5 Mar 2022 06:41:43 -0800 (PST) Received: from dslb-084-059-247-134.084.059.pools.vodafone-ip.de ([84.59.247.134] 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 1nQVbH-0007ms-9q; Sat, 05 Mar 2022 15:41:39 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 4/5] staging: r8188eu: remove unnecessary casts Date: Sat, 5 Mar 2022 15:41:16 +0100 Message-Id: <20220305144117.1380534-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220305144117.1380534-1-martin@kaiser.cx> References: <20220305144117.1380534-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unnecessary casts in update_recvframe_attrib_88e. The final bitwise-and limits the results to u8 or u16, respectively. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index 6b83d7e80ad9..cbc3ce34a50d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -60,39 +60,39 @@ void update_recvframe_attrib_88e(struct recv_frame *pre= cvframe, struct recv_stat struct rx_pkt_attrib *pattrib =3D &precvframe->attrib; memset(pattrib, 0, sizeof(struct rx_pkt_attrib)); =20 - pattrib->crc_err =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 14) & 0x1);/* u= 8)prxreport->crc32; */ + pattrib->crc_err =3D (le32_to_cpu(prxstat->rxdw0) >> 14) & 0x1;/* u8)prxr= eport->crc32; */ =20 /* update rx report to recv_frame attribute */ - pattrib->pkt_rpt_type =3D (u8)((le32_to_cpu(prxstat->rxdw3) >> 14) & 0x3)= ;/* prxreport->rpt_sel; */ + pattrib->pkt_rpt_type =3D (le32_to_cpu(prxstat->rxdw3) >> 14) & 0x3;/* pr= xreport->rpt_sel; */ =20 if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { /* Normal rx packet */ - pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x00003fff);/* = u16)prxreport->pktlen; */ - pattrib->drvinfo_sz =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) = * 8;/* u8)(prxreport->drvinfosize << 3); */ + pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff;/* u16)prx= report->pktlen; */ + pattrib->drvinfo_sz =3D ((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) * 8;= /* u8)(prxreport->drvinfosize << 3); */ =20 - pattrib->physt =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1);/* u= 8)prxreport->physt; */ + pattrib->physt =3D (le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1;/* u8)prxre= port->physt; */ =20 pattrib->bdecrypted =3D (le32_to_cpu(prxstat->rxdw0) & BIT(27)) ? 0 : 1;= /* u8)(prxreport->swdec ? 0 : 1); */ - pattrib->encrypt =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7);/* = u8)prxreport->security; */ + pattrib->encrypt =3D (le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7;/* u8)prx= report->security; */ =20 pattrib->qos =3D (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1;/* prxreport-= >qos; */ - pattrib->priority =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf);/* = u8)prxreport->tid; */ + pattrib->priority =3D (le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf;/* u8)prx= report->tid; */ =20 - pattrib->amsdu =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1);/* u8= )prxreport->amsdu; */ + pattrib->amsdu =3D (le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1;/* u8)prxre= port->amsdu; */ =20 - pattrib->seq_num =3D (u16)(le32_to_cpu(prxstat->rxdw2) & 0x00000fff);/* = u16)prxreport->seq; */ - pattrib->frag_num =3D (u8)((le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf);/*= u8)prxreport->frag; */ - pattrib->mfrag =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1);/* u8= )prxreport->mf; */ - pattrib->mdata =3D (u8)((le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1);/* u8= )prxreport->md; */ + pattrib->seq_num =3D le32_to_cpu(prxstat->rxdw2) & 0x00000fff;/* u16)prx= report->seq; */ + pattrib->frag_num =3D (le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf;/* u8)pr= xreport->frag; */ + pattrib->mfrag =3D (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1;/* u8)prxre= port->mf; */ + pattrib->mdata =3D (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1;/* u8)prxre= port->md; */ =20 - pattrib->mcs_rate =3D (u8)(le32_to_cpu(prxstat->rxdw3) & 0x3f);/* u8)prx= report->rxmcs; */ - pattrib->rxht =3D (u8)((le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1);/* u8)p= rxreport->rxht; */ + pattrib->mcs_rate =3D le32_to_cpu(prxstat->rxdw3) & 0x3f;/* u8)prxreport= ->rxmcs; */ + pattrib->rxht =3D (le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1;/* u8)prxrepo= rt->rxht; */ =20 - pattrib->icv_err =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1);/* = u8)prxreport->icverr; */ - pattrib->shift_sz =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3); + pattrib->icv_err =3D (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1;/* u8)prx= report->icverr; */ + pattrib->shift_sz =3D (le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT1) { /* CCX */ pattrib->pkt_len =3D TX_RPT1_PKT_LEN; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT2) { /* TX RPT */ - pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x3FF);/* Rx le= ngth[9:0] */ + pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x3FF;/* Rx length[9:= 0] */ =20 /* */ /* Get TX report MAC ID valid. */ @@ -101,7 +101,7 @@ void update_recvframe_attrib_88e(struct recv_frame *pre= cvframe, struct recv_stat pattrib->MacIDValidEntry[1] =3D le32_to_cpu(prxstat->rxdw5); =20 } else if (pattrib->pkt_rpt_type =3D=3D HIS_REPORT) { /* USB HISR RPT */ - pattrib->pkt_len =3D (u16)(le32_to_cpu(prxstat->rxdw0) & 0x00003fff);/* = u16)prxreport->pktlen; */ + pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff;/* u16)prx= report->pktlen; */ } } =20 --=20 2.30.2 From nobody Tue Jun 23 12:19:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C777EC433EF for ; Sat, 5 Mar 2022 14:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231895AbiCEOmo (ORCPT ); Sat, 5 Mar 2022 09:42:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231858AbiCEOme (ORCPT ); Sat, 5 Mar 2022 09:42:34 -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 68BAD6929A for ; Sat, 5 Mar 2022 06:41:44 -0800 (PST) Received: from dslb-084-059-247-134.084.059.pools.vodafone-ip.de ([84.59.247.134] 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 1nQVbI-0007ms-GD; Sat, 05 Mar 2022 15:41:40 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 5/5] staging: r8188eu: remove comments in update_recvframe_attrib_88e Date: Sat, 5 Mar 2022 15:41:17 +0100 Message-Id: <20220305144117.1380534-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220305144117.1380534-1-martin@kaiser.cx> References: <20220305144117.1380534-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove a couple of comments in update_recvframe_attrib_88e that provide no useful information. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index cbc3ce34a50d..b4c9738ed868 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -60,48 +60,44 @@ void update_recvframe_attrib_88e(struct recv_frame *pre= cvframe, struct recv_stat struct rx_pkt_attrib *pattrib =3D &precvframe->attrib; memset(pattrib, 0, sizeof(struct rx_pkt_attrib)); =20 - pattrib->crc_err =3D (le32_to_cpu(prxstat->rxdw0) >> 14) & 0x1;/* u8)prxr= eport->crc32; */ + pattrib->crc_err =3D (le32_to_cpu(prxstat->rxdw0) >> 14) & 0x1; =20 - /* update rx report to recv_frame attribute */ - pattrib->pkt_rpt_type =3D (le32_to_cpu(prxstat->rxdw3) >> 14) & 0x3;/* pr= xreport->rpt_sel; */ + pattrib->pkt_rpt_type =3D (le32_to_cpu(prxstat->rxdw3) >> 14) & 0x3; =20 - if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { /* Normal rx packet */ - pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff;/* u16)prx= report->pktlen; */ - pattrib->drvinfo_sz =3D ((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) * 8;= /* u8)(prxreport->drvinfosize << 3); */ + if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { + pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff; + pattrib->drvinfo_sz =3D ((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) * 8; =20 - pattrib->physt =3D (le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1;/* u8)prxre= port->physt; */ + pattrib->physt =3D (le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1; =20 - pattrib->bdecrypted =3D (le32_to_cpu(prxstat->rxdw0) & BIT(27)) ? 0 : 1;= /* u8)(prxreport->swdec ? 0 : 1); */ - pattrib->encrypt =3D (le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7;/* u8)prx= report->security; */ + pattrib->bdecrypted =3D (le32_to_cpu(prxstat->rxdw0) & BIT(27)) ? 0 : 1; + pattrib->encrypt =3D (le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7; =20 - pattrib->qos =3D (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1;/* prxreport-= >qos; */ - pattrib->priority =3D (le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf;/* u8)prx= report->tid; */ + pattrib->qos =3D (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1; + pattrib->priority =3D (le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf; =20 - pattrib->amsdu =3D (le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1;/* u8)prxre= port->amsdu; */ + pattrib->amsdu =3D (le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1; =20 - pattrib->seq_num =3D le32_to_cpu(prxstat->rxdw2) & 0x00000fff;/* u16)prx= report->seq; */ - pattrib->frag_num =3D (le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf;/* u8)pr= xreport->frag; */ - pattrib->mfrag =3D (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1;/* u8)prxre= port->mf; */ - pattrib->mdata =3D (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1;/* u8)prxre= port->md; */ + pattrib->seq_num =3D le32_to_cpu(prxstat->rxdw2) & 0x00000fff; + pattrib->frag_num =3D (le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf; + pattrib->mfrag =3D (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1; + pattrib->mdata =3D (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1; =20 - pattrib->mcs_rate =3D le32_to_cpu(prxstat->rxdw3) & 0x3f;/* u8)prxreport= ->rxmcs; */ - pattrib->rxht =3D (le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1;/* u8)prxrepo= rt->rxht; */ + pattrib->mcs_rate =3D le32_to_cpu(prxstat->rxdw3) & 0x3f; + pattrib->rxht =3D (le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1; =20 - pattrib->icv_err =3D (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1;/* u8)prx= report->icverr; */ + pattrib->icv_err =3D (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1; pattrib->shift_sz =3D (le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT1) { /* CCX */ pattrib->pkt_len =3D TX_RPT1_PKT_LEN; - } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT2) { /* TX RPT */ - pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x3FF;/* Rx length[9:= 0] */ + } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT2) { + pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x3FF; =20 - /* */ - /* Get TX report MAC ID valid. */ - /* */ pattrib->MacIDValidEntry[0] =3D le32_to_cpu(prxstat->rxdw4); pattrib->MacIDValidEntry[1] =3D le32_to_cpu(prxstat->rxdw5); =20 - } else if (pattrib->pkt_rpt_type =3D=3D HIS_REPORT) { /* USB HISR RPT */ - pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff;/* u16)prx= report->pktlen; */ + } else if (pattrib->pkt_rpt_type =3D=3D HIS_REPORT) { + pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff; } } =20 --=20 2.30.2