staging: r8188eu: rename rtl8188e_init_dm_priv to rtw_hal_dm_init

And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index bc253f402d9afad35ff5aa3b73953c0efb36ab19..094c4542a68268aebffb5c94c6044eec7ef6384e 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -25,12 +25,6 @@ void rtw_hal_free_data(struct adapter *adapt)
                adapt->HalFunc.free_hal_data(adapt);
 }
 
-void rtw_hal_dm_init(struct adapter *adapt)
-{
-       if (adapt->HalFunc.dm_init)
-               adapt->HalFunc.dm_init(adapt);
-}
-
 uint    rtw_hal_init(struct adapter *adapt)
 {
        uint    status = _SUCCESS;

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index 73d6827b8895ffb1bf79d0620a290db5af045eae..11e72463045666de958d46abe9bf27ea9187359e 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -174,7 +174,7 @@ skip_dm:
        return;
 }
 
-void rtl8188e_init_dm_priv(struct adapter *Adapter)
+void rtw_hal_dm_init(struct adapter *Adapter)
 {
        struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
        struct dm_priv  *pdmpriv = &hal_data->dmpriv;

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 8c9fdfbc66b5887c8e6c007bb45739a4d5246625..d1f89f867732cd3442c4bda47018869777c59cf7 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -188,8 +188,6 @@ void rtw_hal_notch_filter(struct adapter *adapter, bool enable)
 void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 {
        pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
-
-       pHalFunc->dm_init = &rtl8188e_init_dm_priv;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index b0ade594975c060e190c9d2417daa9f4eae2e968..0228c374c66732f8beeb578cd14bb6d750396b1a 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -142,8 +142,6 @@ enum hal_intf_ps_func {
 struct hal_ops {
        void    (*free_hal_data)(struct adapter *padapter);
 
-       void    (*dm_init)(struct adapter *padapter);
-
        s32     (*interrupt_handler)(struct adapter *padapter);
 
        void (*hal_reset_security_engine)(struct adapter *adapter);

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_dm.h b/drivers/staging/rtl8188eu/include/rtl8188e_dm.h
index 39e453c4eb9e4712217c2c5d1fe9b4a4951ae168..c0ffd98d7617b60fb629573d462010dcff870a52 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_dm.h
@@ -45,7 +45,6 @@ struct        dm_priv {
        u8      PowerIndex_backup[6];
 };
 
-void rtl8188e_init_dm_priv(struct adapter *adapt);
 void rtl8188e_InitHalDm(struct adapter *adapt);
 
 void AntDivCompare8188E(struct adapter *adapt, struct wlan_bssid_ex *dst,