diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-21 09:25:03 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 19:09:27 (GMT) |
| commit | 62b0d72b3cf0307a2fc2693f39b290d6657f49a9 (patch) | |
| tree | 52316f2b8a5b7bde5bbf4aa1d60c6cbd38c27b8a /drivers | |
| parent | bd9bda22d8cf1667f3389418f0a9daad6e6c2ee4 (diff) | |
| download | linux-62b0d72b3cf0307a2fc2693f39b290d6657f49a9.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c index fa3e5aa..fa826b0 100644 --- 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); -} |