Commit c42d9cd5 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove macro ODM_REG 



Replace and remove the macro ODM_REG to make the code cleaner.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210918181904.12000-8-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83a753b3

drivers/staging/r8188eu/hal/odm.c

+3 −3
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI) 
	struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;



	if (pDM_DigTable->CurIGValue != CurrentIGI) {

		ODM_SetBBReg(pDM_Odm, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);

		ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N, ODM_BIT(IGI, pDM_Odm), CurrentIGI);

		pDM_DigTable->CurIGValue = CurrentIGI;

	}

}
@@ -521,7 +521,7 @@ void odm_DIGInit(struct odm_dm_struct *pDM_Odm) 
{

	struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;



	pDM_DigTable->CurIGValue = (u8)ODM_GetBBReg(pDM_Odm, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm));

	pDM_DigTable->CurIGValue = (u8)ODM_GetBBReg(pDM_Odm, ODM_REG_IGI_A_11N, ODM_BIT(IGI, pDM_Odm));

	pDM_DigTable->RssiLowThresh	= DM_DIG_THRESH_LOW;

	pDM_DigTable->RssiHighThresh	= DM_DIG_THRESH_HIGH;

	pDM_DigTable->FALowThresh	= DM_false_ALARM_THRESH_LOW;
@@ -865,7 +865,7 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres) 
	struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;



	if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)		/* modify by Guo.Mingzhi 2012-01-03 */

		ODM_Write1Byte(pDM_Odm, ODM_REG(CCK_CCA, pDM_Odm), CurCCK_CCAThres);

		ODM_Write1Byte(pDM_Odm, ODM_REG_CCK_CCA_11N, CurCCK_CCAThres);

	pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres;

	pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres;

}

drivers/staging/r8188eu/include/odm_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -4,12 +4,10 @@ 
#ifndef	__ODM_INTERFACE_H__

#define __ODM_INTERFACE_H__



#define _reg_11N(_name)			ODM_REG_##_name##_11N

#define _bit_11N(_name)			ODM_BIT_##_name##_11N



#define _cat(_name, _func)	(_func##_11N(_name))



#define ODM_REG(_name, _pDM_Odm) _cat(_name, _reg)

#define ODM_BIT(_name, _pDM_Odm) _cat(_name, _bit)



enum odm_h2c_cmd {