Commit 62b0d72b authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Merge Init_ODM_ComInfo_8723a() into rtl8723a_init_dm_priv() 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd9bda22

drivers/staging/rtl8723au/hal/rtl8723a_dm.c

+5 −15
Original line number Diff line number Diff line
@@ -82,16 +82,15 @@ static void dm_CheckPbcGPIO(struct rtw_adapter *padapter) 


/*  Initialize GPIO setting registers */

/*  functions */

static void Init_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)

{



void rtl8723a_init_dm_priv(struct rtw_adapter *Adapter)

{

	struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);

	struct dm_priv	*pdmpriv = &pHalData->dmpriv;

	struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;

	u8 cut_ver, fab_ver;



	/*  */

	/*  Init Value */

	/*  */

	memset(pdmpriv, 0, sizeof(struct dm_priv));

	memset(pDM_Odm, 0, sizeof(*pDM_Odm));



	pDM_Odm->Adapter = Adapter;
@@ -212,12 +211,3 @@ rtl8723a_HalDmWatchDog( 
	/*  Check Hardware Radio ON/OFF or not */

	dm_CheckPbcGPIO(Adapter);

}
 


void rtl8723a_init_dm_priv(struct rtw_adapter *Adapter)

{

	struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);

	struct dm_priv	*pdmpriv = &pHalData->dmpriv;



	memset(pdmpriv, 0, sizeof(struct dm_priv));

	Init_ODM_ComInfo_8723a(Adapter);

}