From nobody Tue Jun 30 03:34:06 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 0D4B1C4332F for ; Fri, 28 Jan 2022 11:55:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348286AbiA1LzA (ORCPT ); Fri, 28 Jan 2022 06:55:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348263AbiA1Ly5 (ORCPT ); Fri, 28 Jan 2022 06:54:57 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 426DDC061714 for ; Fri, 28 Jan 2022 03:54:56 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id l5so9351215edv.3 for ; Fri, 28 Jan 2022 03:54:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SAICPtOKkXNPySvhlzztTjQEPYjaeld5HVh5aAe14Us=; b=ELF7zql3+BK+pc8iY8fZsC5TPQXk2u0WWd07ZSkZK0RRnYEwQGCup+X1SnUiOIDQ0p TRI0IdyDqg4LsBisPEH1cW6u9qBzSRx2d7xBd+qrJvb649K/y3ac61kQO5kqH28WAlAw g0magaqsiYU2edNk5FtohL0Dd1eCB/MHjS2Cp06+OVZooDypF3qg/lx0IKdo39/iVwTp sZV5fUpNfMsszxuPKAkb45R8c/0mhB/plSah6CV4mxIjR6qbmX+gZc6xYW5se2ZkMgpJ GfY5WgRMyNP11bXHcpB3Cu9WCpQEHu1HfKeJwgJcoHEVQ3keBdaTLtcrUiInXpHTnXPX x+Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SAICPtOKkXNPySvhlzztTjQEPYjaeld5HVh5aAe14Us=; b=DDXMmVtaAvHbxbihLHKmrqggRI1Qr6hKIoT3praC7LvmAVLU271GZ4/Ch9EVfCy4xM G7vFelRWI3n9ytAoCbSaluSZqaiTkgfXAAmCNaRnzP0kheBgGwU4KY6ETks9hQ5NFRk8 x68qW6eSIL9r9HoIecmaM0lxvhoE9CJnwBo3BoZdK9MULOqyjLUzQ3nB1SQXWJJliC2x BQsRthUXjxKj/R2B+FCaYtxAeiQR5/DnN70gDTZg6isM7sB2KHEk1WHgdt0Y2uas2sZV 8XrnI7nDy21t+153H+UKv0V+fb/qUs8FojQBp1mlJlv8Vk4ftp6VCaR829LpwOkXEsZw 0A3Q== X-Gm-Message-State: AOAM531lFzHLhDODf49ik5hceXfhD7YFSudLUQ0v/ficclCEs0sfIxNt TI75XYiHEkUX6eaVhwmNfRg= X-Google-Smtp-Source: ABdhPJx9fz7Xm+Aui5YR3oZYcZrHhbq6GbrvD4/D0AW7K3PQY5FD/o/jBTnd3hWXVez0nhoGl1o48w== X-Received: by 2002:a50:ee97:: with SMTP id f23mr7846690edr.31.1643370894856; Fri, 28 Jan 2022 03:54:54 -0800 (PST) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id h20sm12494261eds.9.2022.01.28.03.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 03:54:54 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/6] staging: r8188eu: rx_packet_offset and max_recvbuf_sz are write-only Date: Fri, 28 Jan 2022 12:54:40 +0100 Message-Id: <20220128115445.6606-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128115445.6606-1-straube.linux@gmail.com> References: <20220128115445.6606-1-straube.linux@gmail.com> 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" The local variables rx_packet_offset and max_recvbuf_sz in rtw_restructure_ht_ie() are set but never used. Remove them. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme.c | 4 ---- drivers/staging/r8188eu/hal/usb_halinit.c | 6 ------ drivers/staging/r8188eu/include/hal_intf.h | 2 -- 3 files changed, 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 6533a7babb65..094885c80a1a 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1901,7 +1901,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct qos_priv *pqospriv =3D &pmlmepriv->qospriv; struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; - u32 rx_packet_offset, max_recvbuf_sz; =20 phtpriv->ht_option =3D false; =20 @@ -1926,9 +1925,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ IEEE80211_HT_CAP_TX_STBC | IEEE80211_HT_CAP_DSSSCCK40); =20 - GetHalDefVar8188EUsb(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offs= et); - GetHalDefVar8188EUsb(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); - /* AMPDU_para [1:0]:Max AMPDU Len =3D> 0:8k , 1:16k, 2:32k, 3:64k AMPDU_para [4:2]:Min MPDU Start Spacing diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index cc8f8c7d0734..d654d2f01c78 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1625,12 +1625,6 @@ u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enu= m hal_def_variable eVariable case HAL_DEF_DRVINFO_SZ: *((u32 *)pValue) =3D DRVINFO_SZ; break; - case HAL_DEF_MAX_RECVBUF_SZ: - *((u32 *)pValue) =3D MAX_RECVBUF_SZ; - break; - case HAL_DEF_RX_PACKET_OFFSET: - *((u32 *)pValue) =3D RXDESC_SIZE + DRVINFO_SZ; - break; case HAL_DEF_DBG_DM_FUNC: *((u32 *)pValue) =3D haldata->odmpriv.SupportAbility; break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 6728cb506303..726e60fd7273 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -76,8 +76,6 @@ enum hal_def_variable { HAL_DEF_IS_SUPPORT_ANT_DIV, HAL_DEF_CURRENT_ANTENNA, HAL_DEF_DRVINFO_SZ, - HAL_DEF_MAX_RECVBUF_SZ, - HAL_DEF_RX_PACKET_OFFSET, HAL_DEF_DBG_DUMP_RXPKT,/* for dbg */ HAL_DEF_DBG_DM_FUNC,/* for dbg */ HAL_DEF_RA_DECISION_RATE, --=20 2.34.1 From nobody Tue Jun 30 03:34:06 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 2C742C433EF for ; Fri, 28 Jan 2022 11:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348282AbiA1LzC (ORCPT ); Fri, 28 Jan 2022 06:55:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348265AbiA1Ly5 (ORCPT ); Fri, 28 Jan 2022 06:54:57 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 224FAC06173B for ; Fri, 28 Jan 2022 03:54:57 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id j2so15133013ejk.6 for ; Fri, 28 Jan 2022 03:54:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=13iP0ysAJRd0WBFMaQVUlv7Pu203h1+BnMCWYbYB0eM=; b=hUY0ajqp9CexidLtdobTizYGbUTHqr+Pzq28rusK1pHK6Hnj9cIlVYSemM4JhiZUEH 7bkRl4CGtNJSgG7wyqlRJON0rNBNZtpGvZAWp0I/vVF4tfgD+l0eeYSyI/w2/Wzny4QP f9l57FPZfPOAGY49L4XEfv3pTm5QuKF9dN6PMwutT933a0rBgqMa7V9ajkwYwYw9UrZc UWxZXrlRUPZi0nYQoQg2yVo0vxCmTHSQ9w+XUtkmp3qwcpT5A+yv1Z1jS/kk6DEHgATY AJGeJMkwgBDRWGefniyI1NUSztzXmC3tNDjKqqzcWhpT94h4cWXU6XKiQ/TPH4I75mMD JJCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=13iP0ysAJRd0WBFMaQVUlv7Pu203h1+BnMCWYbYB0eM=; b=rm9IA+66u7sbZymuSXdyKb1gOXX/u/2Jr/KRbZRa3HXgJPNLXyRdaQkSkG62mC/Yr2 /Xx2dqSl9cJuYJfARo/vkKGMKufZQLE8oN5MvG+tGjD1gU1hQAOlX2kVMD3ZErX2tbwm JUELm/aAbbUsaN+VUBOK6JCQalkOZniXL/jA3o8/peQ8qbHe+SkH/i/RrDY+/o8c4E8B HizSWndV1I6YfkwGY/446yHY4Oe1pRtxm+KR6UwXeyNaCQHMWTPcrWJ7mGLwR4qBG4Tc BRLNijlyorW4OCCK/FyoPbe2vsPnGLS3yMQNcdU30KZJGucKfiETvqs5+A2GI6cdRodG ItYQ== X-Gm-Message-State: AOAM531xdcek1gChbsUXXkHEJVHqUcqTsC5P2poA7t7stNFBkZgrOvz6 9Fz25bb79uMJW5lTD2ptQII= X-Google-Smtp-Source: ABdhPJzx05Ym8i+8QSQXqIYrnHP7zRS2uFfPyNTCJqUjWh41TBla9I6r+wGF74m4tkIK/zCsfhieFw== X-Received: by 2002:a17:906:d551:: with SMTP id cr17mr6320553ejc.27.1643370895696; Fri, 28 Jan 2022 03:54:55 -0800 (PST) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id h20sm12494261eds.9.2022.01.28.03.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 03:54:55 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/6] staging: r8188eu: remove unused cases from GetHalDefVar8188EUsb() Date: Fri, 28 Jan 2022 12:54:41 +0100 Message-Id: <20220128115445.6606-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128115445.6606-1-straube.linux@gmail.com> References: <20220128115445.6606-1-straube.linux@gmail.com> 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" GetHalDefVar8188EUsb() is never called with HAL_DEF_DRVINFO_SZ, HAL_DEF_RA_DECISION_RATE, HAL_DEF_RA_SGI and HAL_DEF_PT_PWR_STATUS. Remove these cases from the function. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 21 --------------------- drivers/staging/r8188eu/include/hal_intf.h | 4 ---- 2 files changed, 25 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index d654d2f01c78..4bb1812f5ae7 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1622,30 +1622,9 @@ u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enu= m hal_def_variable eVariable case HAL_DEF_CURRENT_ANTENNA: *((u8 *)pValue) =3D haldata->CurAntenna; break; - case HAL_DEF_DRVINFO_SZ: - *((u32 *)pValue) =3D DRVINFO_SZ; - break; case HAL_DEF_DBG_DM_FUNC: *((u32 *)pValue) =3D haldata->odmpriv.SupportAbility; break; - case HAL_DEF_RA_DECISION_RATE: - { - u8 MacID =3D *((u8 *)pValue); - *((u8 *)pValue) =3D ODM_RA_GetDecisionRate_8188E(&haldata->odmpriv, Mac= ID); - } - break; - case HAL_DEF_RA_SGI: - { - u8 MacID =3D *((u8 *)pValue); - *((u8 *)pValue) =3D ODM_RA_GetShortGI_8188E(&haldata->odmpriv, MacID); - } - break; - case HAL_DEF_PT_PWR_STATUS: - { - u8 MacID =3D *((u8 *)pValue); - *((u8 *)pValue) =3D ODM_RA_GetHwPwrStatus_8188E(&haldata->odmpriv, MacI= D); - } - break; case HW_VAR_MAX_RX_AMPDU_FACTOR: *((u32 *)pValue) =3D MAX_AMPDU_FACTOR_64K; break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 726e60fd7273..231badaa9cce 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -75,12 +75,8 @@ enum hal_def_variable { HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, HAL_DEF_IS_SUPPORT_ANT_DIV, HAL_DEF_CURRENT_ANTENNA, - HAL_DEF_DRVINFO_SZ, HAL_DEF_DBG_DUMP_RXPKT,/* for dbg */ HAL_DEF_DBG_DM_FUNC,/* for dbg */ - HAL_DEF_RA_DECISION_RATE, - HAL_DEF_RA_SGI, - HAL_DEF_PT_PWR_STATUS, HW_VAR_MAX_RX_AMPDU_FACTOR, HW_DEF_RA_INFO_DUMP, HAL_DEF_DBG_DUMP_TXPKT, --=20 2.34.1 From nobody Tue Jun 30 03:34:06 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 3302AC433EF for ; Fri, 28 Jan 2022 11:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348313AbiA1LzG (ORCPT ); Fri, 28 Jan 2022 06:55:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348268AbiA1Ly6 (ORCPT ); Fri, 28 Jan 2022 06:54:58 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE9D3C061714 for ; Fri, 28 Jan 2022 03:54:57 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id l5so9351300edv.3 for ; Fri, 28 Jan 2022 03:54:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QHoOBbSAYAJOf9zU9cCvl7+FUKLExruc9/8HNa4NGeA=; b=bvvI2DogVfkcbhZuNLt/C/5P+bDasd5InizdUYO6DShjSqJExOgJTjhNMtQ7pr13iU LfxsVYL8xSkEDenRWCBWFrzt3ubKpnm6GuG3FzazLuOfC1YLOe9CX5prE+rYfeeO/KrS LFcSZn5/DcxSj2itCB8QEeUXLBWBkc1yzXWJXHeq8ddRIPKsLSEtqL5drfjZtcAE/Aft viANeMgj703RuuRIOvHLdCdqw6YrHf7PtakFKbTTG916UH49AefszhX3vbjTOgjceqcL 7g4zj1BhZmjImIhll7Sgv30xkGb9zsEfOAb2866gBXR5WDdpHNo39IgMjLqLeugd43tw yjpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QHoOBbSAYAJOf9zU9cCvl7+FUKLExruc9/8HNa4NGeA=; b=7HSPBIEKKqqftCRfhD2tFcORsgbof+U3QVAk0mFDNWCF9WqITIHBI8byQE0xgzZsYZ kVAVY+vJ+cc7dNZeEM271lak02yfdPy+5GctPE3gU4oODDvdKQzDx6hRXbhm9FUSsuiD 3EtVbFWh8Pii/PAw7pznMZm2j+YlR4DYd7hyD+n02LA+toKsRG4jS/7cJjCkrOSOjn5M prpqkCvEZeed87XDvd/JeJntsojh8TAtPpI6akhIlsmjK5tCQv2LYlAknloxE3tvx2F7 pqrLDYY1X4mP48laYvxFnp9puA1UgQNTY6ZiymYB9nlkvk0GeSXfMxGs8H8jf16n0FmR rMKg== X-Gm-Message-State: AOAM530BPHX7doIQwyDsNnAb69cSyPn06nEadq3Tq1bi4FgELPZLCHl3 Al/lU9GLak8NJSmqfBaOh8U= X-Google-Smtp-Source: ABdhPJwsICRuyeoqKlVG10VZYzQudan9E0O8nNteZoJUxcNwIh/z6+3R+QeHENqE+5037PYbz5dztA== X-Received: by 2002:a05:6402:1d4c:: with SMTP id dz12mr4906720edb.385.1643370896422; Fri, 28 Jan 2022 03:54:56 -0800 (PST) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id h20sm12494261eds.9.2022.01.28.03.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 03:54:56 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/6] staging: r8188eu: max_rx_ampdu_factor is always MAX_AMPDU_FACTOR_64K Date: Fri, 28 Jan 2022 12:54:42 +0100 Message-Id: <20220128115445.6606-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128115445.6606-1-straube.linux@gmail.com> References: <20220128115445.6606-1-straube.linux@gmail.com> 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" The local variable max_rx_ampdu_factor in rtw_restructure_ht_ie() and issue_action_BA() is always set to MAX_AMPDU_FACTOR_64K. Remove the variable from both functions and use MAX_AMPDU_FACTOR_64K directly. The case HW_VAR_MAX_RX_AMPDU_FACTOR in GetHalDefVar8188EUsb() is now unused and can be removed. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme.c | 4 +--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 20 +------------------- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/wifi.h | 7 +------ 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 094885c80a1a..038bddc361c3 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1894,7 +1894,6 @@ void rtw_joinbss_reset(struct adapter *padapter) unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, uint in_len, uint *pout_len) { u32 ielen, out_len; - enum ht_cap_ampdu_factor max_rx_ampdu_factor; unsigned char *p; struct ieee80211_ht_cap ht_capie; unsigned char WMM_IE[] =3D {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00}; @@ -1930,8 +1929,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ AMPDU_para [4:2]:Min MPDU Start Spacing */ =20 - GetHalDefVar8188EUsb(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu= _factor); - ht_capie.ampdu_params_info =3D (max_rx_ampdu_factor & 0x03); + ht_capie.ampdu_params_info =3D (MAX_AMPDU_FACTOR_64K & 0x03); =20 if (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_) ht_capie.ampdu_params_info |=3D (IEEE80211_HT_AMPDU_PARM_DENSITY & (0x0= 7 << 2)); diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index aa5ed6ecc432..d60882983086 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5747,7 +5747,6 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch u16 BA_timeout_value; __le16 le_tmp; u16 BA_starting_seqctrl =3D 0; - enum ht_cap_ampdu_factor max_rx_ampdu_factor; struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; u8 *pframe; @@ -5830,24 +5829,7 @@ void issue_action_BA(struct adapter *padapter, unsig= ned char *raddr, unsigned ch pframe =3D rtw_set_fixed_ie(pframe, 1, &pmlmeinfo->ADDBA_req.dialog_tok= en, &pattrib->pktlen); pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&status, &pattr= ib->pktlen); BA_para_set =3D le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f; - GetHalDefVar8188EUsb(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampd= u_factor); - switch (max_rx_ampdu_factor) { - case MAX_AMPDU_FACTOR_64K: - BA_para_set |=3D 0x1000; /* 64 buffer size */ - break; - case MAX_AMPDU_FACTOR_32K: - BA_para_set |=3D 0x0800; /* 32 buffer size */ - break; - case MAX_AMPDU_FACTOR_16K: - BA_para_set |=3D 0x0400; /* 16 buffer size */ - break; - case MAX_AMPDU_FACTOR_8K: - BA_para_set |=3D 0x0200; /* 8 buffer size */ - break; - default: - BA_para_set |=3D 0x1000; /* 64 buffer size */ - break; - } + BA_para_set |=3D 0x1000; /* 64 buffer size */ =20 if (pregpriv->ampdu_amsdu =3D=3D 0)/* disabled */ BA_para_set =3D BA_para_set & ~BIT(0); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 4bb1812f5ae7..87382806774b 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1625,9 +1625,6 @@ u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum= hal_def_variable eVariable case HAL_DEF_DBG_DM_FUNC: *((u32 *)pValue) =3D haldata->odmpriv.SupportAbility; break; - case HW_VAR_MAX_RX_AMPDU_FACTOR: - *((u32 *)pValue) =3D MAX_AMPDU_FACTOR_64K; - break; case HW_DEF_RA_INFO_DUMP: { u8 entry_id =3D *((u8 *)pValue); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 231badaa9cce..f382b7fefb4a 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -77,7 +77,6 @@ enum hal_def_variable { HAL_DEF_CURRENT_ANTENNA, HAL_DEF_DBG_DUMP_RXPKT,/* for dbg */ HAL_DEF_DBG_DM_FUNC,/* for dbg */ - HW_VAR_MAX_RX_AMPDU_FACTOR, HW_DEF_RA_INFO_DUMP, HAL_DEF_DBG_DUMP_TXPKT, }; diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188= eu/include/wifi.h index 0b0bd39a257f..e7083d721dae 100644 --- a/drivers/staging/r8188eu/include/wifi.h +++ b/drivers/staging/r8188eu/include/wifi.h @@ -569,12 +569,7 @@ struct ADDBA_request { __le16 BA_starting_seqctrl; } __packed; =20 -enum ht_cap_ampdu_factor { - MAX_AMPDU_FACTOR_8K =3D 0, - MAX_AMPDU_FACTOR_16K =3D 1, - MAX_AMPDU_FACTOR_32K =3D 2, - MAX_AMPDU_FACTOR_64K =3D 3, -}; +#define MAX_AMPDU_FACTOR_64K 3 =20 /* Spatial Multiplexing Power Save Modes */ #define WLAN_HT_CAP_SM_PS_STATIC 0 --=20 2.34.1 From nobody Tue Jun 30 03:34:06 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 53157C433FE for ; Fri, 28 Jan 2022 11:55:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348293AbiA1LzL (ORCPT ); Fri, 28 Jan 2022 06:55:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348272AbiA1Ly6 (ORCPT ); Fri, 28 Jan 2022 06:54:58 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 837CCC06173B for ; Fri, 28 Jan 2022 03:54:58 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id j2so9306516edj.8 for ; Fri, 28 Jan 2022 03:54:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rYcKKUC0DJ5U+UFpd0rarJw3mrhHuo/xI2TduGQquMw=; b=pMdRF4HTSskGIzaus8V13bLzXZuJL2KoBZQ/pdp6ALyTY94SQgDU0Or+bmjMttfb7f 6Q/YECi1w/de6nfTyKQ/UMXtQgOPjqDVjKzBkPYCMwILSTDAyRtNuOMBOxuEL3H61c2a iGKSECzCTwusQCgLGseyhOW30+F4qNjXcV5IBwBio9Y3am0yyYNEvWxxQhIb0W7sSrWS rOGdT4MsIegJms7SSA7/e+o9vg2K+Dn6Evb0PEf+LYpZA9li2JWh+i5vMTOxIdwDFPqq 3MIexsLTj9beqUCo+Aal1BuS0mTKcftexgoZNdPDS8zQW69dUOI9/O0AYzBn7fLTMFpj 7Bfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rYcKKUC0DJ5U+UFpd0rarJw3mrhHuo/xI2TduGQquMw=; b=SSG9ZeeG9fF30HPftO4aQRXL27vxmtivBzJovxN4PN+AHTBc5dddvJdIqBpaCHCaSW gYWNOyhmA6VLroJ/6PLRtIi5YwMNHBAiVTmwQ5X0Qen/jwSYtl9xihAHC1PiTVFRxwKT XwLlnjulli8KGUrbloid6VwPpKEX+A7rqDOGdcD7gZO451rdzxpeKFMINOB0GlWA14w4 IxAc1Ax95jOcRoahJRpkPRxUfLQ19rZP+UdkHZSs9TMaITg49mOW6tFH8HZH5DzN2eP/ uDIsWhPz5UocLIC3gqKEIfbyoEAOabyO6/QCOtbfhX71wz01nblT04f0NrOvcnLNygHm oxJw== X-Gm-Message-State: AOAM530HBPID1owtLNEJ+6HFyRpcv2FzopfbBWxD0Xp5UXicWNtfEVO5 ZM4zX6bXQ2bBQJSVj7vwTao= X-Google-Smtp-Source: ABdhPJzG99Lv0g65i4LcvY/9roHxtf/XxjYMUpzCuBbthShAEZARuQR+/kGBhVY2FjUmVqlRw9So9A== X-Received: by 2002:a05:6402:3585:: with SMTP id y5mr7921099edc.104.1643370897115; Fri, 28 Jan 2022 03:54:57 -0800 (PST) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id h20sm12494261eds.9.2022.01.28.03.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 03:54:56 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/6] staging: r8188eu: convert GetHalDefVar8188EUsb() to void Date: Fri, 28 Jan 2022 12:54:43 +0100 Message-Id: <20220128115445.6606-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128115445.6606-1-straube.linux@gmail.com> References: <20220128115445.6606-1-straube.linux@gmail.com> 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" The return value of GetHalDefVar8188EUsb() is not used. Convert the function to void. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 6 +----- drivers/staging/r8188eu/include/hal_intf.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 87382806774b..7a640fbaaca6 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1600,10 +1600,9 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } =20 /* Query setting of specified variable. */ -u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVa= riable, void *pValue) +void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue) { struct hal_data_8188e *haldata =3D &Adapter->haldata; - u8 bResult =3D _SUCCESS; =20 switch (eVariable) { case HAL_DEF_UNDERCORATEDSMOOTHEDPWDB: @@ -1647,11 +1646,8 @@ u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enu= m hal_def_variable eVariable *((u8 *)pValue) =3D haldata->bDumpTxPkt; break; default: - bResult =3D _FAIL; break; } - - return bResult; } =20 /* Change default setting of specified variable. */ diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index f382b7fefb4a..96016e175cb5 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -102,7 +102,7 @@ int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); =20 u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVa= riable, void *pValue); -u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVa= riable, void *pValue); +void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue); =20 unsigned int rtl8188eu_inirp_init(struct adapter *Adapter); =20 --=20 2.34.1 From nobody Tue Jun 30 03:34:06 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 DB151C433F5 for ; Fri, 28 Jan 2022 11:55:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348308AbiA1LzN (ORCPT ); Fri, 28 Jan 2022 06:55:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348266AbiA1Ly7 (ORCPT ); Fri, 28 Jan 2022 06:54:59 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39384C061747 for ; Fri, 28 Jan 2022 03:54:59 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id b13so9470310edn.0 for ; Fri, 28 Jan 2022 03:54:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h9cza9dSqPk0L2+uMxlWPbP0uhx5TQLbq0PHDy2GAGI=; b=gBwQn0Dc69hhlkMzoTB559FJzXv2XYymnc1LjJWJg39Wf0Jt07Ekg3ING+cZpqw8C+ Ocm2Tu/YxnPRUbqSy3EdqTPZ567d0cZs8iEmCZm+msl+qHf6QJzPsIlW3tUp0ZrpZbuX v8E2EVHcULS3HTlzPBYKWD/0QPHPe82WpY1YfyrbsXcFKfnU8CIYYfw6jdnLpWOL1Q+i 4rT/7VAhYz8sz9t2zx+aWCvxNFTU5sbyjg5fIQTY4hmyJfT30njUvZ8vURuQP5RXVyOr DWnWho2evY/cTxDxehewPGhAX110cU+8HgLxzIGpKxF3rH3amDg+iC4qeWwwIvZAl9SJ mvlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h9cza9dSqPk0L2+uMxlWPbP0uhx5TQLbq0PHDy2GAGI=; b=lBd89AptSSF8Z9Jeyllhxv3uXfoI7AHJUHeHR4IWqIxsrwu7FyPefaXzBdydaSnHWM PA1pKYbTQXhKq2vNd2hwmVsrGkVvyYi+YTSw7xmqDtrgZyngrFa6A8JD7p5PwRE0dfKA qTLItJ1Rq7cNr90Y6IRgC18Pjj0kYlgx+zKT672f6Pv+mzp8SkeFvvnR8D8SP+AUHczF RJ78LxYQkvOrKWe4lTJxJ6K7XJG2hvth8V0E33Nu+JFVKA012Vlgrsi9r8Tfz7tdJLlN zcXJfDG4V/FKwFBHuGKLbuFJJR53HPPzjqNGMcV/N4UrYoJBvgugvi0WdFIL5KRB/WoE Q/FA== X-Gm-Message-State: AOAM531F+sosRywYgDobMlAREP9aVVWgIEQ7oGyvFfRB9AWLmefo9nkQ AQ36yK8ZkZuTYaRaYMZA7Ik= X-Google-Smtp-Source: ABdhPJwtB8qiP2MjAq5mpzfVzNx01EBjcBYJkBbdCfLRKJXp/TmFcOQmXJaFxjPz+6WfSnjaqlDqYg== X-Received: by 2002:a05:6402:345:: with SMTP id r5mr7987043edw.269.1643370897861; Fri, 28 Jan 2022 03:54:57 -0800 (PST) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id h20sm12494261eds.9.2022.01.28.03.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 03:54:57 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/6] staging: r8188eu: convert SetHalDefVar8188EUsb() to void Date: Fri, 28 Jan 2022 12:54:44 +0100 Message-Id: <20220128115445.6606-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128115445.6606-1-straube.linux@gmail.com> References: <20220128115445.6606-1-straube.linux@gmail.com> 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" The return value of SetHalDefVar8188EUsb() is not used. Convert the function to void. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 6 +----- drivers/staging/r8188eu/include/hal_intf.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 7a640fbaaca6..3aa5289a61f0 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1651,10 +1651,9 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, e= num hal_def_variable eVariab } =20 /* Change default setting of specified variable. */ -u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVa= riable, void *pValue) +void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue) { struct hal_data_8188e *haldata =3D &Adapter->haldata; - u8 bResult =3D _SUCCESS; =20 switch (eVariable) { case HAL_DEF_DBG_DM_FUNC: @@ -1692,11 +1691,8 @@ u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enu= m hal_def_variable eVariable haldata->bDumpTxPkt =3D *((u8 *)pValue); break; default: - bResult =3D _FAIL; break; } - - return bResult; } =20 void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_le= vel) diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 96016e175cb5..9b4d1650b4b5 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -101,7 +101,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32= mac_id, u8 rssi_level); int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); =20 -u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVa= riable, void *pValue); +void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue); void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue); =20 unsigned int rtl8188eu_inirp_init(struct adapter *Adapter); --=20 2.34.1 From nobody Tue Jun 30 03:34:06 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 10D1DC433EF for ; Fri, 28 Jan 2022 11:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348314AbiA1LzO (ORCPT ); Fri, 28 Jan 2022 06:55:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348280AbiA1LzA (ORCPT ); Fri, 28 Jan 2022 06:55:00 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13102C061714 for ; Fri, 28 Jan 2022 03:55:00 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id p7so9307108edc.12 for ; Fri, 28 Jan 2022 03:55:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FKIrVsgP7qkgx8/mcmXHMVQto71IG5bp6nnnHEWfchg=; b=pWaP34kNvTsQcN+oDrlM4c4s0Il+gObNztcFXhJmdIH+c0ej871IrQqI73lp2G3Py1 JG446zAwBjiJNAoQJp6VvDEjYtgUDE9OdGrB2XdvK8a3hpgSgXeFM+gb0VXn91MddB/C O8ewlBqvkI23zM19fX3zc1gVXF/zYw+GFLXC3UNh+bQ5HY6mHmaYCWmyJ0Z/y6poKOtD Ec8bRpvXpl2duW2qH171Ah8DB5LE5/iMJwTQxxC3xn0520g9XaSsDXGB+KD3pqmOUPoD UnDzHmB4ZuIj+tidBvQFLSRNQwmQjUHyulwgWPNDNOlyHnRMxMpRyN2NGBnB2l9PxmXI M//g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FKIrVsgP7qkgx8/mcmXHMVQto71IG5bp6nnnHEWfchg=; b=2Wve/PrVU2TXZQxpNgSMpulJrCplpd/Rxktn/EQ43sUCkNLDlCWr1MeuwbxC5mIoWJ HyYn2K+db26ERP2e03LNrK5yEIXiQw/HwYscxq1F05TqfvE3t15db/5/Z7xrQ2oyugNu +6Wt0g+Gq83sF4ITqE11OKNZXi/X5yMDlmw0Mqly09tXYbLQIt6NqDzB/gSKk7xsNlEd dXuUrd3A2FWulu3lkpfCNIHNMOusvdWneJDwVecmC7u6oAILs/iKmIqChRc/HA6yF4Pw zyWre15rnxO4Q2ejg5eNhDZ0qaNkq/OVujRYwfzbenm3lSOIml6PdaL40rOOxNdXuO2N hrbQ== X-Gm-Message-State: AOAM530kT37VE40wcqertYgdUY3fCTPWDwOlnNfGQBObhzA5vUtc3A8S Aqf6YJIE8EOsp3tI8j32ucw= X-Google-Smtp-Source: ABdhPJzbSKiV9EZtpifZQwcbMHhqaStOryZnGWPbNLNMnNnwz6ynifc2T8r15PkqFeScqwgLoiJYlQ== X-Received: by 2002:aa7:cd08:: with SMTP id b8mr7592785edw.265.1643370898658; Fri, 28 Jan 2022 03:54:58 -0800 (PST) Received: from localhost.localdomain (ip5f5abb9e.dynamic.kabel-deutschland.de. [95.90.187.158]) by smtp.gmail.com with ESMTPSA id h20sm12494261eds.9.2022.01.28.03.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 03:54:58 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 6/6] staging: r8188eu: remove IS_*_CUT macros Date: Fri, 28 Jan 2022 12:54:45 +0100 Message-Id: <20220128115445.6606-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128115445.6606-1-straube.linux@gmail.com> References: <20220128115445.6606-1-straube.linux@gmail.com> 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 the IS_*_CUT macros from HalVerDef.h. They are not needed, we can use a switch on chip_vers.CUTVersion directly in dump_chip_info() Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/hal_com.c | 24 ++++++++++++++------- drivers/staging/r8188eu/include/HalVerDef.h | 18 ---------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/drivers/staging/r8188eu/hal/hal_com.c b/drivers/staging/r8188e= u/hal/hal_com.c index ba5d027d765f..7f28fd08f0aa 100644 --- a/drivers/staging/r8188eu/hal/hal_com.c +++ b/drivers/staging/r8188eu/hal/hal_com.c @@ -20,19 +20,27 @@ void dump_chip_info(struct HAL_VERSION chip_vers) "Normal_Chip" : "Test_Chip"); cnt +=3D sprintf((buf + cnt), "%s_", IS_CHIP_VENDOR_TSMC(chip_vers) ? "TSMC" : "UMC"); - if (IS_A_CUT(chip_vers)) + + switch (chip_vers.CUTVersion) { + case A_CUT_VERSION: cnt +=3D sprintf((buf + cnt), "A_CUT_"); - else if (IS_B_CUT(chip_vers)) + break; + case B_CUT_VERSION: cnt +=3D sprintf((buf + cnt), "B_CUT_"); - else if (IS_C_CUT(chip_vers)) + break; + case C_CUT_VERSION: cnt +=3D sprintf((buf + cnt), "C_CUT_"); - else if (IS_D_CUT(chip_vers)) + break; + case D_CUT_VERSION: cnt +=3D sprintf((buf + cnt), "D_CUT_"); - else if (IS_E_CUT(chip_vers)) + break; + case E_CUT_VERSION: cnt +=3D sprintf((buf + cnt), "E_CUT_"); - else - cnt +=3D sprintf((buf + cnt), "UNKNOWN_CUT(%d)_", - chip_vers.CUTVersion); + break; + default: + cnt +=3D sprintf((buf + cnt), "UNKNOWN_CUT(%d)_", chip_vers.CUTVersion); + break; + } =20 cnt +=3D sprintf((buf + cnt), "1T1R_"); =20 diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/= r8188eu/include/HalVerDef.h index f4816ac765e5..2bc18eabb55d 100644 --- a/drivers/staging/r8188eu/include/HalVerDef.h +++ b/drivers/staging/r8188eu/include/HalVerDef.h @@ -14,8 +14,6 @@ enum HAL_CUT_VERSION { C_CUT_VERSION =3D 2, D_CUT_VERSION =3D 3, E_CUT_VERSION =3D 4, - F_CUT_VERSION =3D 5, - G_CUT_VERSION =3D 6, }; =20 enum HAL_VENDOR { @@ -33,27 +31,11 @@ struct HAL_VERSION { /* Get element */ #define GET_CVID_CHIP_TYPE(version) (((version).ChipType)) #define GET_CVID_MANUFACTUER(version) (((version).VendorType)) -#define GET_CVID_CUT_VERSION(version) (((version).CUTVersion)) - -/* Common Macro. -- */ -/* HAL_VERSION VersionID */ =20 /* HAL_CHIP_TYPE_E */ #define IS_NORMAL_CHIP(version) \ ((GET_CVID_CHIP_TYPE(version) =3D=3D NORMAL_CHIP) ? true : false) =20 -/* HAL_CUT_VERSION_E */ -#define IS_A_CUT(version) \ - ((GET_CVID_CUT_VERSION(version) =3D=3D A_CUT_VERSION) ? true : false) -#define IS_B_CUT(version) \ - ((GET_CVID_CUT_VERSION(version) =3D=3D B_CUT_VERSION) ? true : false) -#define IS_C_CUT(version) \ - ((GET_CVID_CUT_VERSION(version) =3D=3D C_CUT_VERSION) ? true : false) -#define IS_D_CUT(version) \ - ((GET_CVID_CUT_VERSION(version) =3D=3D D_CUT_VERSION) ? true : false) -#define IS_E_CUT(version) \ - ((GET_CVID_CUT_VERSION(version) =3D=3D E_CUT_VERSION) ? true : false) - /* HAL_VENDOR_E */ #define IS_CHIP_VENDOR_TSMC(version) \ ((GET_CVID_MANUFACTUER(version) =3D=3D CHIP_VENDOR_TSMC) ? true : false) --=20 2.34.1