Commit 9b0c770f authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: r8188eu: remove DeInitSwLeds from hal_ops

Remove DeInitSwLeds from hal_ops and remove its wrapper
rtw_hal_sw_led_deinit(). Call rtl8188eu_DeInitSwLeds() directly
instead.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-3-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16dfd0e2
...@@ -25,12 +25,6 @@ void rtw_hal_dm_deinit(struct adapter *adapt) ...@@ -25,12 +25,6 @@ void rtw_hal_dm_deinit(struct adapter *adapt)
adapt->HalFunc.dm_deinit(adapt); adapt->HalFunc.dm_deinit(adapt);
} }
void rtw_hal_sw_led_deinit(struct adapter *adapt)
{
if (adapt->HalFunc.DeInitSwLeds)
adapt->HalFunc.DeInitSwLeds(adapt);
}
u32 rtw_hal_power_on(struct adapter *adapt) u32 rtw_hal_power_on(struct adapter *adapt)
{ {
if (adapt->HalFunc.hal_power_on) if (adapt->HalFunc.hal_power_on)
......
...@@ -2246,7 +2246,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) ...@@ -2246,7 +2246,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
halfunc->init_recv_priv = &rtl8188eu_init_recv_priv; halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;
halfunc->free_recv_priv = &rtl8188eu_free_recv_priv; halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;
halfunc->DeInitSwLeds = &rtl8188eu_DeInitSwLeds;
halfunc->SetHwRegHandler = &SetHwReg8188EU; halfunc->SetHwRegHandler = &SetHwReg8188EU;
halfunc->GetHwRegHandler = &GetHwReg8188EU; halfunc->GetHwRegHandler = &GetHwReg8188EU;
......
...@@ -143,8 +143,6 @@ struct hal_ops { ...@@ -143,8 +143,6 @@ struct hal_ops {
s32 (*init_recv_priv)(struct adapter *padapter); s32 (*init_recv_priv)(struct adapter *padapter);
void (*free_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter);
void (*DeInitSwLeds)(struct adapter *padapter);
void (*dm_init)(struct adapter *padapter); void (*dm_init)(struct adapter *padapter);
void (*dm_deinit)(struct adapter *padapter); void (*dm_deinit)(struct adapter *padapter);
...@@ -255,7 +253,6 @@ void rtw_hal_free_data(struct adapter *padapter); ...@@ -255,7 +253,6 @@ void rtw_hal_free_data(struct adapter *padapter);
void rtw_hal_dm_init(struct adapter *padapter); void rtw_hal_dm_init(struct adapter *padapter);
void rtw_hal_dm_deinit(struct adapter *padapter); void rtw_hal_dm_deinit(struct adapter *padapter);
void rtw_hal_sw_led_deinit(struct adapter *padapter);
u32 rtw_hal_power_on(struct adapter *padapter); u32 rtw_hal_power_on(struct adapter *padapter);
uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_init(struct adapter *padapter);
......
...@@ -3862,7 +3862,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, ...@@ -3862,7 +3862,7 @@ static int rtw_rereg_nd_name(struct net_device *dev,
rtw_led_control(padapter, LED_CTL_POWER_OFF); rtw_led_control(padapter, LED_CTL_POWER_OFF);
rereg_priv->old_bRegUseLed = padapter->ledpriv.bRegUseLed; rereg_priv->old_bRegUseLed = padapter->ledpriv.bRegUseLed;
padapter->ledpriv.bRegUseLed = false; padapter->ledpriv.bRegUseLed = false;
rtw_hal_sw_led_deinit(padapter); rtl8188eu_DeInitSwLeds(padapter);
/* the interface is being "disabled", we can do deeper IPS */ /* the interface is being "disabled", we can do deeper IPS */
rereg_priv->old_ips_mode = rtw_get_ips_mode_req(&padapter->pwrctrlpriv); rereg_priv->old_ips_mode = rtw_get_ips_mode_req(&padapter->pwrctrlpriv);
......
...@@ -906,7 +906,7 @@ void rtw_cancel_all_timer(struct adapter *padapter) ...@@ -906,7 +906,7 @@ void rtw_cancel_all_timer(struct adapter *padapter)
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
/* cancel sw led timer */ /* cancel sw led timer */
rtw_hal_sw_led_deinit(padapter); rtl8188eu_DeInitSwLeds(padapter);
_cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer); _cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment