From nobody Mon Apr 6 11:53:14 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 AC63DC07E9D for ; Mon, 26 Sep 2022 17:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229759AbiIZR4H (ORCPT ); Mon, 26 Sep 2022 13:56:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbiIZRzg (ORCPT ); Mon, 26 Sep 2022 13:55:36 -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 82B6D6173C for ; Mon, 26 Sep 2022 10:32:51 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id hy2so15616409ejc.8 for ; Mon, 26 Sep 2022 10:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=kRLijR5oyAOegAsMr9uRqxn4ejdUkVTR852YUUghNUE=; b=HAKciU4TTD/RKp/d/Zwr4SkfntWLJ6I2A59VOxclITi0+ND1ld1jMAF4vl1KCNsZd6 nxcQE7zKVfS/a//nrFteMMgaydHNI2DLLDsvt4O3UoWoSMA4pZuv3BpGdsprZ9O5o0/6 NMgAh5uw0Y49tl4lbwz1lXqEe9ASBi+78/kAOgDk+VgJuLS82Z/Rs+DFmvmLtZt1b8UK N9GPSfeCtrmreSAbve3PHFOeYHIUy2ntW7zZRAKbBpHhTb4P4FeselQwBNpbxYq8yxH2 ixRvNU/AhDKWdJNb51bDc6OrRVj2SNJoeu2jGKJDhU8+ncvjsDaXpG0XAu14Yqvx/ncG qpAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=kRLijR5oyAOegAsMr9uRqxn4ejdUkVTR852YUUghNUE=; b=OQYkZ86PVmSHuLqZk4W2Tm0LfakpGUCCsxKN9bxwz0sHXE+igb1LbSwG3q2I9E/WRL lNkWyMujrxGUkRjOnN6WJMuoDzAtow2Pc2g+SbTyhkHiVy3hGrZk9MVaRiKCroji3vB4 2Sls6oZMcliMZCG6LYFuubQRC9NCZMmMoceCJW36jnw3cSOEIhnjoIPpJamRuQbKoYre bcsqW7rFbRyi8gDRC7OX6OX2uPS7T3ERabPxLBzVIHi7dOsLTblU8utNm7eHVfJryzIn qPl2/n0sVd9LfKZtJ3aFMV5kvkqkBXO7DkZADpDd/044xUBmpAi6spGtz/pptpdjI196 IDWg== X-Gm-Message-State: ACrzQf0NEtcEVxW8dT3Siq1rz5dSfwU/7C0faO9Optem5iy9CGBsMJDX vSesYHskfSlRULCAcSP500YSfQOdPwI= X-Google-Smtp-Source: AMsMyM7m9kNWqUF+vdLNEDJ+Oh4nkq5deojnLJRurAWBKV3yeD4Q6lMxcOu4GxwXON075c8s1fexxQ== X-Received: by 2002:a17:906:854b:b0:782:4c6f:5ff6 with SMTP id h11-20020a170906854b00b007824c6f5ff6mr18231861ejy.603.1664213570117; Mon, 26 Sep 2022 10:32:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id y4-20020a1709060a8400b00782667df018sm6554617ejf.54.2022.09.26.10.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:32:49 -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 1/3] staging: r8188eu: make odm_ConfigMAC_8188E() static Date: Mon, 26 Sep 2022 19:32:41 +0200 Message-Id: <20220926173243.8767-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173243.8767-1-straube.linux@gmail.com> References: <20220926173243.8767-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 function odm_ConfigMAC_8188E() is only used in HalHWImg8188E_MAC.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 5 +++++ drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 5 ----- drivers/staging/r8188eu/include/odm_RegConfig8188E.h | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c b/drivers/stag= ing/r8188eu/hal/HalHWImg8188E_MAC.c index 77b25885c63b..e615bc37c74f 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c @@ -126,6 +126,11 @@ static u32 array_MAC_REG_8188E[] =3D { 0x70B, 0x00000087, }; =20 +static void odm_ConfigMAC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u= 8 Data) +{ + rtw_write8(pDM_Odm->Adapter, Addr, Data); +} + enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_o= dm) { #define READ_NEXT_PAIR(v1, v2, i) do { i +=3D 2; v1 =3D array[i]; v2 =3D = array[i + 1]; } while (0) diff --git a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c b/drivers/sta= ging/r8188eu/hal/odm_RegConfig8188E.c index 0fa17a99f9e9..e6e10a3c8d54 100644 --- a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +++ b/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c @@ -33,11 +33,6 @@ void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM= _Odm, u32 Addr, u32 Data odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, Addr | maskforPhySet); } =20 -void odm_ConfigMAC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u8 Data) -{ - rtw_write8(pDM_Odm->Adapter, Addr, Data); -} - void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 B= itmask, u32 Data) { rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); diff --git a/drivers/staging/r8188eu/include/odm_RegConfig8188E.h b/drivers= /staging/r8188eu/include/odm_RegConfig8188E.h index 683fa4a07956..9cecbf9532f5 100644 --- a/drivers/staging/r8188eu/include/odm_RegConfig8188E.h +++ b/drivers/staging/r8188eu/include/odm_RegConfig8188E.h @@ -7,8 +7,6 @@ void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Data); =20 -void odm_ConfigMAC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u8 Data); - void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data); =20 --=20 2.37.3 From nobody Mon Apr 6 11:53:14 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 A994FC32771 for ; Mon, 26 Sep 2022 17:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229629AbiIZR4M (ORCPT ); Mon, 26 Sep 2022 13:56:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230146AbiIZRzg (ORCPT ); Mon, 26 Sep 2022 13:55:36 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36B51DBF for ; Mon, 26 Sep 2022 10:32:52 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id u24so10015984edb.9 for ; Mon, 26 Sep 2022 10:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=chQdQ1OJInZBPZSx9Da9erBbPScxyL3Yh0RTnHzjDog=; b=mMrt+yWZg8MJ0vlVlYf0aeWrXVRCmn5VOZUqe2P7roWiwSemQVuLkGga1ckz5ph/k5 fIOk4idieZuCZpUBOkQe4e9Z6IrVsPclropIR/d7lQieSQDf9bumfkLqzvNuB8srbC+x /1vylDmA170vwMv7A1j7eUxmXAGZdkSccjdB7TbHaRaDrsTL9D32pNKkvH2BTHjPeHwc kir1ZKNL9SF1RThJu+Ye2fCi3HWgvmox27cgSGj1WtXHByA0EI6I2skBq7YSor1AZEo4 6Vpcq8EVbw0oK1mA7yH/gJevDjNySby/UHosVROTDbHKJJziW6GgCTA+B770CEidYuWF SnNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=chQdQ1OJInZBPZSx9Da9erBbPScxyL3Yh0RTnHzjDog=; b=zpx8rPR4CGaSTpbc//3PZHBif/o0EL6rjY2V15jcOuYiTG1ECqklCcSM3X3WMJU+D8 B/FLuGXl6VnYlAf1JKDCEoyogapnwtSLiihnMj3DAqWj+GhxjsgTeIueqC4Wlip4oaCx PB/tz+dEfMGOuybfV8ckeW3sg0c/cMKj+CeiswwzPqWoSmo3WL2pGF6LOcmecjezb4I4 /BJElke6zkLmCUMRPRQyvmFIipvQA/XUoKclu2MvWNke1lszuHWYpLndhAFGJq32a64t 3xHtt9PsCSr6hYSeOEGizM3aFgtd/IyJbzlLoBWqKiDjmtErKAsnHLIlVIIuTXt4udT1 3plg== X-Gm-Message-State: ACrzQf01FeOeaGe4crwlJJpgMuOpbJ+i4ft5xfEUMazljk2hnKFwDF1/ 93tcdTcd3QqC21W3FwoTwT0= X-Google-Smtp-Source: AMsMyM7LRZevVNJGFSlpW39DHMVH4Gvjb+2uC0freI1aEdDjrQW2ti09AlZb14Mp6upd/1aPNkSAeQ== X-Received: by 2002:aa7:cd8e:0:b0:452:2682:a955 with SMTP id x14-20020aa7cd8e000000b004522682a955mr23796156edv.379.1664213570721; Mon, 26 Sep 2022 10:32:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id y4-20020a1709060a8400b00782667df018sm6554617ejf.54.2022.09.26.10.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:32:50 -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 2/3] staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static Date: Mon, 26 Sep 2022 19:32:42 +0200 Message-Id: <20220926173243.8767-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173243.8767-1-straube.linux@gmail.com> References: <20220926173243.8767-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 function odm_ConfigRF_RadioA_8188E() is only used in HalHWImg8188E_RF.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- .../staging/r8188eu/hal/HalHWImg8188E_RF.c | 30 +++++++++++++++++++ .../staging/r8188eu/hal/odm_RegConfig8188E.c | 30 ------------------- .../r8188eu/include/odm_RegConfig8188E.h | 3 -- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c b/drivers/stagi= ng/r8188eu/hal/HalHWImg8188E_RF.c index 08cbfce3808d..ea123817e3d5 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c @@ -130,6 +130,36 @@ static u32 Array_RadioA_1T_8188E[] =3D { 0x000, 0x00033E60, }; =20 +static void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, + u32 Data, u32 RegAddr) +{ + if (Addr =3D=3D 0xffe) { + msleep(50); + } else if (Addr =3D=3D 0xfd) { + mdelay(5); + } else if (Addr =3D=3D 0xfc) { + mdelay(1); + } else if (Addr =3D=3D 0xfb) { + udelay(50); + } else if (Addr =3D=3D 0xfa) { + udelay(5); + } else if (Addr =3D=3D 0xf9) { + udelay(1); + } else { + rtl8188e_PHY_SetRFReg(pDM_Odm->Adapter, RegAddr, bRFRegOffsetMask, Data); + /* Add 1us delay between BB/RF register setting. */ + udelay(1); + } +} + +static void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 A= ddr, u32 Data) +{ + u32 content =3D 0x1000; /* RF_Content: radioa_txt */ + u32 maskforPhySet =3D (u32)(content & 0xE000); + + odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, Addr | maskforPhySet); +} + enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pD= M_Odm) { #define READ_NEXT_PAIR(v1, v2, i) do \ diff --git a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c b/drivers/sta= ging/r8188eu/hal/odm_RegConfig8188E.c index e6e10a3c8d54..963697574e9e 100644 --- a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +++ b/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c @@ -3,36 +3,6 @@ =20 #include "../include/drv_types.h" =20 -static void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, - u32 Data, u32 RegAddr) -{ - if (Addr =3D=3D 0xffe) { - msleep(50); - } else if (Addr =3D=3D 0xfd) { - mdelay(5); - } else if (Addr =3D=3D 0xfc) { - mdelay(1); - } else if (Addr =3D=3D 0xfb) { - udelay(50); - } else if (Addr =3D=3D 0xfa) { - udelay(5); - } else if (Addr =3D=3D 0xf9) { - udelay(1); - } else { - rtl8188e_PHY_SetRFReg(pDM_Odm->Adapter, RegAddr, bRFRegOffsetMask, Data); - /* Add 1us delay between BB/RF register setting. */ - udelay(1); - } -} - -void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u3= 2 Data) -{ - u32 content =3D 0x1000; /* RF_Content: radioa_txt */ - u32 maskforPhySet =3D (u32)(content & 0xE000); - - odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, Addr | maskforPhySet); -} - void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 B= itmask, u32 Data) { rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); diff --git a/drivers/staging/r8188eu/include/odm_RegConfig8188E.h b/drivers= /staging/r8188eu/include/odm_RegConfig8188E.h index 9cecbf9532f5..ce8af50d13bb 100644 --- a/drivers/staging/r8188eu/include/odm_RegConfig8188E.h +++ b/drivers/staging/r8188eu/include/odm_RegConfig8188E.h @@ -4,9 +4,6 @@ #ifndef __INC_ODM_REGCONFIG_H_8188E #define __INC_ODM_REGCONFIG_H_8188E =20 -void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, - u32 Addr, u32 Data); - void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data); =20 --=20 2.37.3 From nobody Mon Apr 6 11:53:14 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 AC97EC32771 for ; Mon, 26 Sep 2022 17:56:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229670AbiIZR4R (ORCPT ); Mon, 26 Sep 2022 13:56:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbiIZRzg (ORCPT ); Mon, 26 Sep 2022 13:55:36 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE39061D44 for ; Mon, 26 Sep 2022 10:32:52 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id z13so15654514ejp.6 for ; Mon, 26 Sep 2022 10:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=xi2G+BsPgSScnEoa84XoZM1sbuZ3s1TxWbx1fy5OnFQ=; b=dB9ShWeAoemK8HvsNrZeb0wa+SP+dM2SqTIjA1wcBvy2YebMogV0sfju5Fdw1/NqwR ov4mqnS5uJcJugeRKiCITxHiBzVmmWNcfTp2elc3aR/J/iuzTcefzBDTdsGlhaCX/Nk5 9COMZLPtGjHXlfTdFgOI/c8O43In1fTC+1l8wOnSuWcZwDl7pg1jcL3bkl32vEjyICKq GIhC1RzUcdGiUk/USdXP6RF5kyh+fCyGJTf1iE/Uv58KFVD92HA0w8/SN6+9y0e7Og1C jcZTSZe5G1c/5cBPemgoMoRFEIk5GM5DqtbPfgIW/zlygkH+LiAY+YzmdC3Fb8olYBzO gUHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=xi2G+BsPgSScnEoa84XoZM1sbuZ3s1TxWbx1fy5OnFQ=; b=zdaU6wO1A9FzTQsAcl9Td16xCf8K2lJRAfzSxOcC6SGMQEAsKJjDoQwodbJ58+z8zx UM/wuD0PPKatcxLjjVBWsVad0kqyKYNy54S9ATa9dqIj7mxl1jOT2UlL9E6j2v/4NgnP VBpRIW9eVbLnqDGptjPrvbfQl+zGuEM59fzfpQc5ELTNQjsJ9VMtuoMh0jI0cuTizfTb vfrS4tUQfcxoeK8xVpLohnm64PRtmcUvnmDJH9NvmeIubhTLImT+Xjezd6UStcjptmxJ SkN1voNnhpmHUhjd9/9S7KTLL1m7DoH/Y9d2M2ZpfZAnalSyRO/SlaYKlMbNJskAp52W q9fQ== X-Gm-Message-State: ACrzQf1mU/NqUGoKfDMH/xEvNsRwpTT4AUqlNuqXC3SrG2gU2SEBAl4a X8FqwNhfvNCPAp8XaeSgdUA= X-Google-Smtp-Source: AMsMyM5xgm78mRRMZIhRXfbbuWI2UfC8uHaO4bxogWFeRF8kouBkDSMfIrMwz4EFp0GZkub8DSS5tQ== X-Received: by 2002:a17:907:a049:b0:77c:1f27:1b28 with SMTP id gz9-20020a170907a04900b0077c1f271b28mr20641845ejc.20.1664213571368; Mon, 26 Sep 2022 10:32:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id y4-20020a1709060a8400b00782667df018sm6554617ejf.54.2022.09.26.10.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:32:51 -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 3/3] staging: r8188eu: remove hal/odm_RegConfig8188E.c Date: Mon, 26 Sep 2022 19:32:43 +0200 Message-Id: <20220926173243.8767-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173243.8767-1-straube.linux@gmail.com> References: <20220926173243.8767-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" All remaining functions in hal/odm_RegConfig8188E.c are only used in hal/HalHWImg8188E_BB.c. Make them static and remove the now empty file hal/odm_RegConfig8188E.c and the header odm_RegConfig8188E.h. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/Makefile | 1 - .../staging/r8188eu/hal/HalHWImg8188E_BB.c | 50 +++++++++++++++++ .../staging/r8188eu/hal/odm_RegConfig8188E.c | 54 ------------------- .../r8188eu/include/odm_RegConfig8188E.h | 16 ------ .../staging/r8188eu/include/rtl8188e_hal.h | 1 - 5 files changed, 50 insertions(+), 72 deletions(-) delete mode 100644 drivers/staging/r8188eu/hal/odm_RegConfig8188E.c delete mode 100644 drivers/staging/r8188eu/include/odm_RegConfig8188E.h diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Mak= efile index f5091a3ed4d2..fd494c2299e6 100644 --- a/drivers/staging/r8188eu/Makefile +++ b/drivers/staging/r8188eu/Makefile @@ -10,7 +10,6 @@ r8188eu-y =3D \ hal/hal_com.o \ hal/odm.o \ hal/odm_HWConfig.o \ - hal/odm_RegConfig8188E.o \ hal/odm_RTL8188E.o \ hal/rtl8188e_cmd.o \ hal/rtl8188e_dm.o \ diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c b/drivers/stagi= ng/r8188eu/hal/HalHWImg8188E_BB.c index 7901d0afa2e7..a4eb2879b77e 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c @@ -166,6 +166,13 @@ static u32 array_agc_tab_1t_8188e[] =3D { 0xC78, 0x407F0001, }; =20 +static void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr= , u32 Bitmask, u32 Data) +{ + rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); + /* Add 1us delay between BB/RF register setting. */ + udelay(1); +} + enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *d= m_odm) { u32 hex =3D 0; @@ -442,6 +449,30 @@ static u32 array_phy_reg_1t_8188e[] =3D { 0xF00, 0x00000300, }; =20 +static void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr= , u32 Bitmask, u32 Data) +{ + if (Addr =3D=3D 0xfe) { + msleep(50); + } else if (Addr =3D=3D 0xfd) { + mdelay(5); + } else if (Addr =3D=3D 0xfc) { + mdelay(1); + } else if (Addr =3D=3D 0xfb) { + udelay(50); + } else if (Addr =3D=3D 0xfa) { + udelay(5); + } else if (Addr =3D=3D 0xf9) { + udelay(1); + } else { + if (Addr =3D=3D 0xa24) + pDM_Odm->RFCalibrateInfo.RegA24 =3D Data; + rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); + + /* Add 1us delay between BB/RF register setting. */ + udelay(1); + } +} + enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *d= m_odm) { u32 hex =3D 0; @@ -647,6 +678,25 @@ static u32 array_phy_reg_pg_8188e[] =3D { =20 }; =20 +static void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u= 32 Addr, u32 Bitmask, + u32 Data) +{ + if (Addr =3D=3D 0xfe) + msleep(50); + else if (Addr =3D=3D 0xfd) + mdelay(5); + else if (Addr =3D=3D 0xfc) + mdelay(1); + else if (Addr =3D=3D 0xfb) + udelay(50); + else if (Addr =3D=3D 0xfa) + udelay(5); + else if (Addr =3D=3D 0xf9) + udelay(1); + else + storePwrIndexDiffRateOffset(pDM_Odm->Adapter, Addr, Bitmask, Data); +} + void ODM_ReadAndConfig_PHY_REG_PG_8188E(struct odm_dm_struct *dm_odm) { u32 hex; diff --git a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c b/drivers/sta= ging/r8188eu/hal/odm_RegConfig8188E.c deleted file mode 100644 index 963697574e9e..000000000000 --- a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#include "../include/drv_types.h" - -void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 B= itmask, u32 Data) -{ - rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); - /* Add 1us delay between BB/RF register setting. */ - udelay(1); -} - -void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, - u32 Bitmask, u32 Data) -{ - if (Addr =3D=3D 0xfe) - msleep(50); - else if (Addr =3D=3D 0xfd) - mdelay(5); - else if (Addr =3D=3D 0xfc) - mdelay(1); - else if (Addr =3D=3D 0xfb) - udelay(50); - else if (Addr =3D=3D 0xfa) - udelay(5); - else if (Addr =3D=3D 0xf9) - udelay(1); - else - storePwrIndexDiffRateOffset(pDM_Odm->Adapter, Addr, Bitmask, Data); -} - -void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 B= itmask, u32 Data) -{ - if (Addr =3D=3D 0xfe) { - msleep(50); - } else if (Addr =3D=3D 0xfd) { - mdelay(5); - } else if (Addr =3D=3D 0xfc) { - mdelay(1); - } else if (Addr =3D=3D 0xfb) { - udelay(50); - } else if (Addr =3D=3D 0xfa) { - udelay(5); - } else if (Addr =3D=3D 0xf9) { - udelay(1); - } else { - if (Addr =3D=3D 0xa24) - pDM_Odm->RFCalibrateInfo.RegA24 =3D Data; - rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data); - - /* Add 1us delay between BB/RF register setting. */ - udelay(1); - } -} diff --git a/drivers/staging/r8188eu/include/odm_RegConfig8188E.h b/drivers= /staging/r8188eu/include/odm_RegConfig8188E.h deleted file mode 100644 index ce8af50d13bb..000000000000 --- a/drivers/staging/r8188eu/include/odm_RegConfig8188E.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __INC_ODM_REGCONFIG_H_8188E -#define __INC_ODM_REGCONFIG_H_8188E - -void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, - u32 Bitmask, u32 Data); - -void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, - u32 Bitmask, u32 Data); - -void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, - u32 Bitmask, u32 Data); - -#endif diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 64cdc2fad20e..ed4091e7cc7e 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -23,7 +23,6 @@ #include "HalHWImg8188E_MAC.h" #include "HalHWImg8188E_RF.h" #include "HalHWImg8188E_BB.h" -#include "odm_RegConfig8188E.h" #include "odm_RTL8188E.h" =20 #define DRVINFO_SZ 4 /* unit is 8bytes */ --=20 2.37.3