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

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index fa3e5aafd51d91a1da83cc1340b4fb11a78897d8..fa826b068d11ea8a91247a0b3b6a708e78d6efe5 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -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;
+       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 @@ skip_dm:
        /*  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);
-}