diff options
| author | Ivan Safonov | 2016-09-03 17:33:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-12 11:30:03 +0200 |
| commit | a5c2587435c613f3676c321dd378552c0628a144 (patch) | |
| tree | 9c46cbd2005c0cbc864c9c7f50ec006ecb0a1a64 | |
| parent | staging: r8188eu: rename ReadChipVersion8188E to rtw_hal_read_chip_version (diff) | |
| download | kernel-qcow2-linux-a5c2587435c613f3676c321dd378552c0628a144.tar.gz kernel-qcow2-linux-a5c2587435c613f3676c321dd378552c0628a144.tar.xz kernel-qcow2-linux-a5c2587435c613f3676c321dd378552c0628a144.zip | |
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>
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/hal_intf.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/hal_intf.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 1 |
5 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c index bc253f402d9a..094c4542a682 100644 --- 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 73d6827b8895..11e724630456 100644 --- 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 8c9fdfbc66b5..d1f89f867732 100644 --- 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 b0ade594975c..0228c374c667 100644 --- 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 39e453c4eb9e..c0ffd98d7617 100644 --- 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, |