staging: r8188eu: remove odm_RegConfig8188E.c
cover staging: r8188eu: remove odm_RegConfig8188E.c
This series removes hal/odm_RegConfig8188E.c and its header odm_RegConfig8188E.h by making the functions defined in that file static.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (3):
staging: r8188eu: make odm_ConfigMAC_8188E() static
staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static
staging: r8188eu: remove hal/odm_RegConfig8188E.c
drivers/staging/r8188eu/Makefile | 1 - .../staging/r8188eu/hal/HalHWImg8188E_BB.c | 50 +++++++++++ .../staging/r8188eu/hal/HalHWImg8188E_MAC.c | 5 ++ .../staging/r8188eu/hal/HalHWImg8188E_RF.c | 30 +++++++ .../staging/r8188eu/hal/odm_RegConfig8188E.c | 89 ------------------- .../r8188eu/include/odm_RegConfig8188E.h | 21 ----- .../staging/r8188eu/include/rtl8188e_hal.h | 1 - 7 files changed, 85 insertions(+), 112 deletions(-) delete mode 100644 drivers/staging/r8188eu/hal/odm_RegConfig8188E.c delete mode 100644 drivers/staging/r8188eu/include/odm_RegConfig8188E.h
Signature · 1 line
2.37.3
PATCH 1/3 staging: r8188eu: make odm_ConfigMAC_8188E() static
The function odm_ConfigMAC_8188E() is only used in HalHWImg8188E_MAC.c. Make it static.
--- 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(-)
drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c +5 -0
@@ -126,6 +126,11 @@ static u32 array_MAC_REG_8188E[] = { 0x70B, 0x00000087, }; +static void odm_ConfigMAC_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u8 Data) +{ +rtw_write8 (pDM_Odm->Adapter, Addr, Data); +} +enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E (struct odm_dm_struct *dm_odm) {#define READ_NEXT_PAIR (v1, v2, i) do { i += 2; v1 = array[i]; v2 = array[i + 1]; } while (0)
drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +0 -5
@@ -33,11 +33,6 @@ void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Dataodm_ConfigRFReg_8188E (pDM_Odm, Addr, Data, Addr | maskforPhySet); } -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 Bitmask,u32 Data) {rtl8188e_PHY_SetBBReg (pDM_Odm->Adapter, Addr, Bitmask, Data);
drivers/staging/r8188eu/include/odm_RegConfig8188E.h +0 -2
@@ -7,8 +7,6 @@void odm_ConfigRF_RadioA_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr,u32 Data); -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);
Signature · 1 line
2.37.3
PATCH 2/3 staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static
In reply to Michael StraubeThe function odm_ConfigRF_RadioA_8188E() is only used in HalHWImg8188E_RF.c. Make it static.
--- .../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(-)
drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c +30 -0
@@ -130,6 +130,36 @@ static u32 Array_RadioA_1T_8188E[] = { 0x000, 0x00033E60, }; +static void odm_ConfigRFReg_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr, +u32 Data,u32 RegAddr) +{ +if (Addr ==0xffe ) { +msleep (50 ); + }else if (Addr ==0xfd ) { +mdelay (5 ); + }else if (Addr ==0xfc ) { +mdelay (1 ); + }else if (Addr ==0xfb ) { +udelay (50 ); + }else if (Addr ==0xfa ) { +udelay (5 ); + }else if (Addr ==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 Addr,u32 Data) +{ +u32 content =0x1000 ;/* RF_Content: radioa_txt */ +u32 maskforPhySet = (u32)(content &0xE000 ); + +odm_ConfigRFReg_8188E (pDM_Odm, Addr, Data, Addr | maskforPhySet); +} +enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E (struct odm_dm_struct *pDM_Odm) {#define READ_NEXT_PAIR (v1, v2, i) do \
drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +0 -30
@@ -3,36 +3,6 @@#include "../include/drv_types.h" -static void odm_ConfigRFReg_8188E (struct odm_dm_struct *pDM_Odm,u32 Addr, -u32 Data,u32 RegAddr) -{ -if (Addr ==0xffe ) { -msleep (50 ); - }else if (Addr ==0xfd ) { -mdelay (5 ); - }else if (Addr ==0xfc ) { -mdelay (1 ); - }else if (Addr ==0xfb ) { -udelay (50 ); - }else if (Addr ==0xfa ) { -udelay (5 ); - }else if (Addr ==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,u32 Data) -{ -u32 content =0x1000 ;/* RF_Content: radioa_txt */ -u32 maskforPhySet = (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 Bitmask,u32 Data) {rtl8188e_PHY_SetBBReg (pDM_Odm->Adapter, Addr, Bitmask, Data);
drivers/staging/r8188eu/include/odm_RegConfig8188E.h +0 -3
@@ -4,9 +4,6 @@#ifndef __INC_ODM_REGCONFIG_H_8188E#define __INC_ODM_REGCONFIG_H_8188E -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);
Signature · 1 line
2.37.3
PATCH 3/3 staging: r8188eu: remove hal/odm_RegConfig8188E.c
In reply to Michael StraubeAll 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.
--- 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
drivers/staging/r8188eu/Makefile +0 -1
@@ -10,7 +10,6 @@ r8188eu-y = \ 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 \
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +50 -0
68 lines not on this page · raw message
drivers/staging/r8188eu/hal/odm_RegConfig8188E.c deleted +0 -54
54 lines not on this page · raw message
drivers/staging/r8188eu/include/odm_RegConfig8188E.h deleted +0 -16
@@ -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
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
@@ -23,7 +23,6 @@#include "HalHWImg8188E_MAC.h" #include "HalHWImg8188E_RF.h" #include "HalHWImg8188E_BB.h" -#include "odm_RegConfig8188E.h" #include "odm_RTL8188E.h" #define DRVINFO_SZ 4/* unit is 8bytes */
Signature · 1 line
2.37.3
Quoted 19 lines · Michael Straube
This series removes
hal/odm_RegConfig8188E.cand its headerodm_RegConfig8188E.hby making the functions defined in that file static.Tested on
x86_64with Inter-Tech DMG-02.Michael Straube (3):
staging: r8188eu: make odm_ConfigMAC_8188E() static staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static staging: r8188eu: remove hal/odm_RegConfig8188E.cdrivers/staging/r8188eu/Makefile | 1 - .../staging/r8188eu/hal/HalHWImg8188E_BB.c | 50 +++++++++++ .../staging/r8188eu/hal/HalHWImg8188E_MAC.c | 5 ++ .../staging/r8188eu/hal/HalHWImg8188E_RF.c | 30 +++++++ .../staging/r8188eu/hal/odm_RegConfig8188E.c | 89 ------------------- .../r8188eu/include/odm_RegConfig8188E.h | 21 ----- .../staging/r8188eu/include/rtl8188e_hal.h | 1 - 7 files changed, 85 insertions(+), 112 deletions(-)
Quoted 3 lines
delete mode 100644
drivers/staging/r8188eu/hal/odm_RegConfig8188E.cdelete mode 100644drivers/staging/r8188eu/include/odm_RegConfig8188E.h