From nobody Fri Jun 19 09:37:43 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 2DFE9C433FE for ; Tue, 5 Apr 2022 22:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359830AbiDEWAc (ORCPT ); Tue, 5 Apr 2022 18:00:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358857AbiDELRj (ORCPT ); Tue, 5 Apr 2022 07:17:39 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E380589305 for ; Tue, 5 Apr 2022 03:49:27 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id n6so11778267ejc.13 for ; Tue, 05 Apr 2022 03:49:27 -0700 (PDT) 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=zD1kXeS1kclzzdV89Yh6GTfc9Fb/ROE7/kA41SKYvPA=; b=JvijGFR0Mo9047KejSeh5imWsynBG2ab7mdKpGSk7iREVkHWUP3qVkSoBI0i3ZVSuy mOy3gQC42UCpZuE4FUymaZWOexVhTNqRrF5NbQq73XC6wR4SVrJk5cy20KHR3+7Fhxcm OP0uasULbcaUt+1O+/sRRcSJEGx8bS3LLDmwfvKf0HXlVdctfTDKdd4pMJtxIFgpnHhI DxKL1+9KcO57fxRSSP+Bu+hV34vEgYuBJRz53q/Rz5bpg/xT7vPLOIK0b8txP4NVBPMh aBGoRyyGSPkBMa0cOCAnpTUryFbV0A4fcouQpVkU3z6sxZ9XN14IIQEAG63rAnpelzxO U+DA== 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=zD1kXeS1kclzzdV89Yh6GTfc9Fb/ROE7/kA41SKYvPA=; b=W67/uXHBFAqB1Q6ZhKJZqu1vK8QE9HtpxgcGAYE/y5dM+3xwmCdZ7j8tsYMeVCs8te mc5X7Dyj7N+3GbUDMwBKBfvbxSeyp/TIjnbxaoDXBiw9jZ5bMft2mI67WoDZtNqN1gAd EJZW42OMsPG5caePljrLGJB9Uz3ZQJ+8QOVedhqmVb0a6SStAWAXAID+JJqJTnsk8Tax Mj/GYkCgXk4Vj1UH5zjibaFhBNfb3sZcLsm4jj25ls5SksDJOGfrXoCbp4nULnpGjBqS 1ZQQVwJSjdPoMVCfMZpWVCjbwYWJnIb6bCDe9h8fcQPxlv1vYUw6JWBsUlzeiprvtj1A PLpw== X-Gm-Message-State: AOAM530uoJfyN4k9sJeAdVieFidwrmJ7kBR9T6JYe9c1yzP5T4APHcx+ kzCictbL3cGibHLwVJ+TwFg= X-Google-Smtp-Source: ABdhPJwmvbxYcATdJGs6tIu5uarpASeWFbRGq3gJjHqxw8Y9mHDS0WnAWMzFzkswBpgf0+/IjidnQQ== X-Received: by 2002:a17:906:d146:b0:6da:f381:4dfe with SMTP id br6-20020a170906d14600b006daf3814dfemr2856426ejb.670.1649155766340; Tue, 05 Apr 2022 03:49:26 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id j12-20020a50e0cc000000b0041cd813ac01sm2436702edl.28.2022.04.05.03.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:49:25 -0700 (PDT) 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 v2 1/4] staging: r8188eu: cur_ant is set but never used Date: Tue, 5 Apr 2022 12:49:07 +0200 Message-Id: <20220405104910.9769-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405104910.9769-1-straube.linux@gmail.com> References: <20220405104910.9769-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" In rtw_select_and_join_from_scanned_queue() the local variable cur_ant is set but never used. Remove the variable and related dead code. Signed-off-by: Michael Straube --- v2: - made it the first patch in the series - changed subject line drivers/staging/r8188eu/core/rtw_mlme.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index f94b1536a177..24ceb8028f89 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1458,7 +1458,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlm= e_priv *pmlmepriv) struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *candidate =3D NULL; - u8 supp_ant_div =3D false; =20 spin_lock_bh(&pmlmepriv->scanned_queue.lock); phead =3D get_list_head(queue); @@ -1485,12 +1484,6 @@ int rtw_select_and_join_from_scanned_queue(struct ml= me_priv *pmlmepriv) rtw_free_assoc_resources(adapter, 0); } =20 - GetHalDefVar8188EUsb(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &supp_ant_div); - if (supp_ant_div) { - u8 cur_ant; - GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &cur_ant); - } - ret =3D rtw_joinbss_cmd(adapter, candidate); =20 exit: --=20 2.35.1 From nobody Fri Jun 19 09:37:43 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 21C28C43219 for ; Wed, 6 Apr 2022 00:26:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1588478AbiDFAQO (ORCPT ); Tue, 5 Apr 2022 20:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358879AbiDELRk (ORCPT ); Tue, 5 Apr 2022 07:17:40 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB69189CD9 for ; Tue, 5 Apr 2022 03:49:28 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id l26so9515332ejx.1 for ; Tue, 05 Apr 2022 03:49:28 -0700 (PDT) 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=zViYAUFQVHIRikDuX6j+iM/MlBPaBYxpO5JyU8YFMSI=; b=HX7FccOo5jAwIAyUPKPVfO1C7rM0P2OVxOou/QVrnJSIT8xcG1zyigtwztrhCwtuY9 ZmM78DmWkl1jSmUf0/sqnlU3hvYkKN9lXcyisU0IZ+cgFmbjyuE1H5TyxDwTavTb0gvU CAAMscYuY3SiXo+X1RhtxqSoVeU+ebWghnPhMSFrs+TuvIccWK9kKjRO/5GCbSTy4F7y +UxAuJuGV8ergvjCPFOyk23JC+QdVT/B9jmn7GfWJh6TDjo3JMPE3KWskuzQ88jxubQc a/9s1mTkhxnFQatLwgT/tuwaZ3Wrr5t/5G1gAi+FFjSQADlhFcR6vjLeZySxdKf6L4bn nv3g== 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=zViYAUFQVHIRikDuX6j+iM/MlBPaBYxpO5JyU8YFMSI=; b=ZYYHOpXFLwNL4WmNEcpJ7Tb7JIDuwvTrKSGWySiBRZcyjWjxaqsNQa1iOeTeJhGkQX 8aJ4nowJgN1gvebBWiZiKxhGKut/I37eucLB6Yavy/wMoGFZkVX8RCu03IzFqTcjD5Cf Ix9iVmOuF6Noij9vKRcSp5nVC5PlMNLjgt7BaNYWNpQKsr3GtHAbNRijZQY7Xyi9joBF oQpqnIGGbkSuU8puylDT/9DWsflVLT1s5WHhfSl5igsEloafP7NiS493jPU/jc+/KINM DoWPyhzE6qhN2a0W073R4ILd/66ry5ky8UZCchL0tM3U36oJFVVSOK+apySWltOJrfAc x5PA== X-Gm-Message-State: AOAM533LL/juKywbPmyyU6h1N/YTt0aBTf1mS9rV1ccEG6eDtPvYAgYC WGCXXkM0k1wvtw6UStWbLsQ= X-Google-Smtp-Source: ABdhPJz2XGP+0BiflWArPaHsDrJe6au9KfAeYxqej54AetrBlgpkuyRds+r5h/lm/oAs4/axf/h0FA== X-Received: by 2002:a17:907:7f04:b0:6e0:39a2:79a6 with SMTP id qf4-20020a1709077f0400b006e039a279a6mr2775579ejc.243.1649155767360; Tue, 05 Apr 2022 03:49:27 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id j12-20020a50e0cc000000b0041cd813ac01sm2436702edl.28.2022.04.05.03.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:49:26 -0700 (PDT) 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 v2 2/4] staging: r8188eu: remove HAL_DEF_IS_SUPPORT_ANT_DIV Date: Tue, 5 Apr 2022 12:49:08 +0200 Message-Id: <20220405104910.9769-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405104910.9769-1-straube.linux@gmail.com> References: <20220405104910.9769-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" In order to get rid of the function GetHalDefVar8188EUsb(), remove the HAL_DEF_IS_SUPPORT_ANT_DIV case from it and move the functionality into a new function. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: - made the function static - used a more obvious function name drivers/staging/r8188eu/core/rtw_cmd.c | 11 ++++++++--- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 8b24330e97c1..66d4346a34ee 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1094,16 +1094,21 @@ static void antenna_select_wk_hdl(struct adapter *p= adapter, u8 antenna) } } =20 +static bool rtw_antenna_diversity(struct adapter *adapter) +{ + struct hal_data_8188e *haldata =3D &adapter->haldata; + + return haldata->AntDivCfg !=3D 0; +} + u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct cmd_priv *pcmdpriv =3D &padapter->cmdpriv; - u8 support_ant_div; u8 res =3D _SUCCESS; =20 - GetHalDefVar8188EUsb(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_d= iv); - if (!support_ant_div) + if (!rtw_antenna_diversity(padapter)) return res; =20 if (enqueue) { diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 4bc6b08fb282..805460bd6340 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1204,9 +1204,6 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, en= um hal_def_variable eVariab struct hal_data_8188e *haldata =3D &Adapter->haldata; =20 switch (eVariable) { - case HAL_DEF_IS_SUPPORT_ANT_DIV: - *((u8 *)pValue) =3D (haldata->AntDivCfg =3D=3D 0) ? false : true; - break; case HAL_DEF_CURRENT_ANTENNA: *((u8 *)pValue) =3D haldata->CurAntenna; break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index e222ab89bfc5..6a80e517a7ad 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -28,7 +28,6 @@ enum hw_variables { }; =20 enum hal_def_variable { - HAL_DEF_IS_SUPPORT_ANT_DIV, HAL_DEF_CURRENT_ANTENNA, HAL_DEF_DBG_DM_FUNC,/* for dbg */ }; --=20 2.35.1 From nobody Fri Jun 19 09:37:43 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 031E5C433F5 for ; Tue, 5 Apr 2022 23:17:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574074AbiDEWyV (ORCPT ); Tue, 5 Apr 2022 18:54:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358873AbiDELRk (ORCPT ); Tue, 5 Apr 2022 07:17:40 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC28D89CF0 for ; Tue, 5 Apr 2022 03:49:29 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id qh7so15792622ejb.11 for ; Tue, 05 Apr 2022 03:49:29 -0700 (PDT) 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=DdE0cWQr6i8HJhNHJBVncn9A4zrQB0bj2Lr35kMyNmk=; b=CWQ2TqmLik4q8+yl73JOsZj5n+wxS+EVpOHhkpJexOg6GbcnUHH3dCdjFKcSmYysma kOWBR/Zrsl5/fZEf/1CcoEqOJYcZ3gpXa3eYWI7X/sOSe5ty83bac33uYZ2AcLbBTo/k ZiLFHBht5P2+ZJ6jgDeO8vhvU0xXqYdn59qaSz1XJy8Jntfy2fV6Es19Doo1I6x+Ant4 KouAqcvyUgPzgLxeXyXX4FtGaR8hrK/1Wu5+0r2rPzsRn3MZnDMt0CFKLflG80wFbELz 2EblNgLwjvxhcMSCdwjMhEuxw/p3xJtVr3nOzcE4e+N9b84wap7Y2mXL5Az3Judso/1L bMtQ== 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=DdE0cWQr6i8HJhNHJBVncn9A4zrQB0bj2Lr35kMyNmk=; b=tNeLc+KvU8I5z6CbmvFtqfa8EZd2DbUB9wcnkChXo8ckKHkpZABqDl7m28RP9e3tPJ VyLRybc1LfoyyTpIPLqlcR68TSkDVHUole7CbNzLryVUw1WcuOEvz/FvUIN+pEU1Ozin D8yZzMhH9hFu5g88dRmE40wbDNYiqEOX1R0/ufiLZHbuayW+JdQfzj6b5bZEzTqNr2Pk D8BzDLJGZlAQihLt2iZ4ZptHV48LsavTWSTSmdRCqj9n1u5ezjvz7GJUDZCOYxIgzMbv bxalyGXimIPskAcAQsERvXSBYJk2rONdqWz6FfN3a/hFS9Du5yF1eNOQB4wHCjdBZgqn i05Q== X-Gm-Message-State: AOAM531hEBqx9nGC3ZbdvZkUThjecBg0gmz4gUBuNsdIZ+dU6ORIQl6T NoAIaBHmkRtGpHDDpof1YlU= X-Google-Smtp-Source: ABdhPJzJVrMx3iD6K5VVfUAuj2M5QlJy/tVSJ3xDQ0LPjP9PckN3Tv9IgWrskNJ97ZmX1VgAcuh3zA== X-Received: by 2002:a17:906:c104:b0:6e4:a223:1af9 with SMTP id do4-20020a170906c10400b006e4a2231af9mr2749446ejc.441.1649155768137; Tue, 05 Apr 2022 03:49:28 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id j12-20020a50e0cc000000b0041cd813ac01sm2436702edl.28.2022.04.05.03.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:49:27 -0700 (PDT) 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 v2 3/4] staging: r8188eu: remove HAL_DEF_CURRENT_ANTENNA Date: Tue, 5 Apr 2022 12:49:09 +0200 Message-Id: <20220405104910.9769-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405104910.9769-1-straube.linux@gmail.com> References: <20220405104910.9769-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" In order to get rid of the function GetHalDefVar8188EUsb(), remove the HAL_DEF_CURRENT_ANTENNA case from it and move the functionality into a new function. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: - added rtw_ prefix to the function name - added the function in rtw_mlme.c drivers/staging/r8188eu/core/rtw_mlme.c | 12 ++++++++++-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/rtw_mlme.h | 2 ++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 24ceb8028f89..e98d77676e6d 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -464,6 +464,13 @@ static void update_current_network(struct adapter *ada= pter, struct wlan_bssid_ex =20 } =20 +u8 rtw_current_antenna(struct adapter *adapter) +{ + struct hal_data_8188e *haldata =3D &adapter->haldata; + + return haldata->CurAntenna; +} + /* Caller must hold pmlmepriv->lock first. */ @@ -497,7 +504,8 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t /* If there are no more slots, expire the oldest */ pnetwork =3D oldest; =20 - GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo= .Optimum_antenna); + target->PhyInfo.Optimum_antenna =3D rtw_current_antenna(adapter); + memcpy(&pnetwork->network, target, get_wlan_bssid_ex_sz(target)); /* variable initialize */ pnetwork->fixed =3D false; @@ -520,7 +528,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t =20 bssid_ex_sz =3D get_wlan_bssid_ex_sz(target); target->Length =3D bssid_ex_sz; - GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo= .Optimum_antenna); + target->PhyInfo.Optimum_antenna =3D rtw_current_antenna(adapter); memcpy(&pnetwork->network, target, bssid_ex_sz); =20 pnetwork->last_scanned =3D jiffies; diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 2c073219c13f..6207fd8cccae 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5995,7 +5995,7 @@ u8 collect_bss_info(struct adapter *padapter, struct = recv_frame *precv_frame, st bssid->Rssi =3D precv_frame->attrib.phy_info.recvpower; /* in dBM.raw da= ta */ bssid->PhyInfo.SignalQuality =3D precv_frame->attrib.phy_info.SignalQuali= ty;/* in percentage */ bssid->PhyInfo.SignalStrength =3D precv_frame->attrib.phy_info.SignalStre= ngth;/* in percentage */ - GetHalDefVar8188EUsb(padapter, HAL_DEF_CURRENT_ANTENNA, &bssid->PhyInfo.= Optimum_antenna); + bssid->PhyInfo.Optimum_antenna =3D rtw_current_antenna(padapter); =20 /* checking SSID */ p =3D rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength= - ie_offset); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 805460bd6340..9d39c5ca56a7 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1204,9 +1204,6 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, en= um hal_def_variable eVariab struct hal_data_8188e *haldata =3D &Adapter->haldata; =20 switch (eVariable) { - case HAL_DEF_CURRENT_ANTENNA: - *((u8 *)pValue) =3D haldata->CurAntenna; - 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 6a80e517a7ad..0bc274a695d9 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -28,7 +28,6 @@ enum hw_variables { }; =20 enum hal_def_variable { - HAL_DEF_CURRENT_ANTENNA, HAL_DEF_DBG_DM_FUNC,/* for dbg */ }; =20 diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 37d217aaf524..1dc1fbf049af 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -598,4 +598,6 @@ void rtw_set_max_rpt_macid(struct adapter *adapter, u8 = macid); void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *ps= ta, u32 mstatus); =20 +u8 rtw_current_antenna(struct adapter *adapter); + #endif /* __RTL871X_MLME_H_ */ --=20 2.35.1 From nobody Fri Jun 19 09:37:43 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 CA6DFC41535 for ; Tue, 5 Apr 2022 22:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1455118AbiDEWkP (ORCPT ); Tue, 5 Apr 2022 18:40:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358881AbiDELRk (ORCPT ); Tue, 5 Apr 2022 07:17:40 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2DEB8A32D for ; Tue, 5 Apr 2022 03:49:31 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a6so14915022ejk.0 for ; Tue, 05 Apr 2022 03:49:31 -0700 (PDT) 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=Adg3pN2RW58wCT9rm+ufFClNqKORGkE/N3E2nxNd7RY=; b=UNwkZnqk7dS8LG08uS2paqAo7c3EjqpY8dO4XyoghVpgARkcT6BjhzsEHkCyaVGpuU VZ6s3URU004FZ/EoRCCHRR/W8F5zWAOv/G7xiHymasP8sycr/kBLCTG0grOPxO/SmNzV UNxkr13NClG5ZDi4Nw5F4ofob7HKxUqPMAGb2b4EYS3xbxKGanh8Z444D6FmFFCj5Fhy ewg3m03VFw9oGe8R2qzecy6YNvD/4gK9TnGx8uN2/HwEVTXXxx/ZLLQWGsrB7fJdJhCc IBEwwcYUVQd+HfJbyfvfFpXVsJhgvtR9mudbizOoFuqeO45C3zBccb4ilmoblr8/ySFK WQ2w== 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=Adg3pN2RW58wCT9rm+ufFClNqKORGkE/N3E2nxNd7RY=; b=8NIRqzSCkGZkxBmzriTJ7XLeb0dlXhOxJF6sG9MphkKYzpCOnyy/J7QeoTXIQV2089 2BckPFByKb4jfMawVSk+170roJok+a50pu29qREEGtEyrVAyTvNgE3KigCebaBDVtwAp 7jS/Tl9ZsXZY25UwFewLFnWdTv5xYtvkKxsgwrV2yM1DhD9pfrfd/LUZTpHZ45s456eP QIiuCv8IL6gNsOdi7HtnZPTbfOrEfN6ec954bjbGB1xlGVLsq2JPGUZ6LvZ0TkpwPkAy 5MMiE4YPNrcjyGIcJKEApEqKRHQrWueXIciy3lTldUvBGFn8Kl2Q/t9v8qCxqI1zMhIy S1lg== X-Gm-Message-State: AOAM5337WWSLfC4jMlJosfdiHczpxvWCzlrxvmNbfcKVG9Tfisjnv3Lc YXkpgmgvMZfSRoK3kP2Zge4= X-Google-Smtp-Source: ABdhPJxtwBNi5M3av58Natvm7wrBfwyDLFGOKk8pLWKQyqncAUaQNgIcZ12kpqxDNSOBKvaW+hZhxw== X-Received: by 2002:a17:907:c16:b0:6db:682:c8c9 with SMTP id ga22-20020a1709070c1600b006db0682c8c9mr2987787ejc.153.1649155769444; Tue, 05 Apr 2022 03:49:29 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id j12-20020a50e0cc000000b0041cd813ac01sm2436702edl.28.2022.04.05.03.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:49:28 -0700 (PDT) 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 v2 4/4] staging: r8188eu: remove GetHalDefVar8188EUsb() Date: Tue, 5 Apr 2022 12:49:10 +0200 Message-Id: <20220405104910.9769-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405104910.9769-1-straube.linux@gmail.com> References: <20220405104910.9769-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 odm_flag in rtw_dbg_port() is set but never used. This are the last two remaining calls to GetHalDefVar8188EUsb(). Both calls can be removed and we finally can remove GetHalDefVar8188EUsb() itself. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/hal/usb_halinit.c | 14 -------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 9d39c5ca56a7..c983e42bf523 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1198,20 +1198,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) =20 } =20 -/* Query setting of specified variable. */ -void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue) -{ - struct hal_data_8188e *haldata =3D &Adapter->haldata; - - switch (eVariable) { - case HAL_DEF_DBG_DM_FUNC: - *((u32 *)pValue) =3D haldata->odmpriv.SupportAbility; - break; - default: - break; - } -} - /* Change default setting of specified variable. */ void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue) { diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 0bc274a695d9..ab6cab1281ab 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -52,7 +52,6 @@ int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); =20 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 diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index d127cebb6eae..b6851628e4d2 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -3675,22 +3675,16 @@ static int rtw_dbg_port(struct net_device *dev, break; case 0xee:/* turn on/off dynamic funcs */ { - u32 odm_flag; - - if (0xf =3D=3D extra_arg) { - GetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &odm_flag); - } else { + if (extra_arg !=3D 0xf) { /* extra_arg =3D 0 - disable all dynamic func extra_arg =3D 1 - disable DIG extra_arg =3D 2 - disable tx power tracking extra_arg =3D 3 - turn on all dynamic func */ SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &extra_arg); - GetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DM_FUNC, &odm_flag); } } break; - case 0xfd: rtw_write8(padapter, 0xc50, arg); rtw_write8(padapter, 0xc58, arg); --=20 2.35.1