From: Ivan Safonov Date: Sat, 3 Sep 2016 15:33:56 +0000 (+0700) Subject: staging: r8188eu: remove hal_reset_security_engine member of hal_ops structure X-Git-Tag: Ubuntu-5.10.0-12.13~11763^2~679 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e72a384b8fa3599bf8f4f9d6cd139f83ce8d168e;p=mirror_ubuntu-hirsute-kernel.git staging: r8188eu: remove hal_reset_security_engine member of hal_ops structure hal_reset_security_engine always is NULL. Also rtw_hal_reset_security_engine function removed. Signed-off-by: Ivan Safonov Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c index d76ccd0eb1e5..12fde452fc21 100644 --- a/drivers/staging/rtl8188eu/hal/hal_intf.c +++ b/drivers/staging/rtl8188eu/hal/hal_intf.c @@ -32,8 +32,6 @@ uint rtw_hal_init(struct adapter *adapt) if (adapt->registrypriv.notch_filter == 1) rtw_hal_notch_filter(adapt, 1); - - rtw_hal_reset_security_engine(adapt); } else { adapt->hw_init_completed = false; DBG_88E("rtw_hal_init: hal__init fail\n"); @@ -77,9 +75,3 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) UpdateHalRAMask8188EUsb(adapt, mac_id, rssi_level); } } - -void rtw_hal_reset_security_engine(struct adapter *adapter) -{ - if (adapter->HalFunc.hal_reset_security_engine) - adapter->HalFunc.hal_reset_security_engine(adapter); -} diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h index 2528a6e8296e..262a704add21 100644 --- a/drivers/staging/rtl8188eu/include/hal_intf.h +++ b/drivers/staging/rtl8188eu/include/hal_intf.h @@ -140,7 +140,6 @@ enum hal_intf_ps_func { }; struct hal_ops { - void (*hal_reset_security_engine)(struct adapter *adapter); }; enum rt_eeprom_type { @@ -228,7 +227,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, void rtw_hal_sreset_init(struct adapter *padapter); void rtw_hal_notch_filter(struct adapter *adapter, bool enable); -void rtw_hal_reset_security_engine(struct adapter *adapter); void indicate_wx_scan_complete_event(struct adapter *padapter); u8 rtw_do_join(struct adapter *padapter);