Commit a1a7f3a8 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: merge ODM_ConfigMACWithHeaderFile into PHY_MACConfig8188E 



The ODM_ConfigMACWithHeaderFile function is only one line. Merge it into
PHY_MACConfig8188E, which is its only caller.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220110124638.6909-8-martin@kaiser.cx


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

drivers/staging/r8188eu/hal/odm_HWConfig.c

+0 −5
Original line number Diff line number Diff line
@@ -377,8 +377,3 @@ enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm, 


	return HAL_STATUS_FAILURE;

}
 


enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *dm_odm)

{

	return ODM_ReadAndConfig_MAC_REG_8188E(dm_odm);

}

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) 
	/*  */

	/*  Config MAC */

	/*  */

	if (HAL_STATUS_FAILURE == ODM_ConfigMACWithHeaderFile(&pHalData->odmpriv))

	if (HAL_STATUS_FAILURE == ODM_ReadAndConfig_MAC_REG_8188E(&pHalData->odmpriv))

		rtStatus = _FAIL;



	/*  2010.07.13 AMPDU aggregation number B */

drivers/staging/r8188eu/include/odm_HWConfig.h

+0 −3
Original line number Diff line number Diff line
@@ -99,7 +99,4 @@ enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm); 


enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm,

					   enum odm_bb_config_type ConfigType);



enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *pDM_Odm);



#endif