Commit 4bd92a77 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Remove checks of pointer to rtllib.. and ScanOpera..

Function pointers of rtllib_ips_leave and ScanOperationBackupHandler is
set while executing the probe function. Therefore a NULL pointer check is
not required. Remove checks as it is dead code.
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8b01cbfaad2db4666b98bfeae29dd429d8c6cd07.1677345331.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 997f7f0c
...@@ -703,8 +703,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -703,8 +703,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)
if (priv->up == 0) if (priv->up == 0)
return -1; return -1;
if (priv->rtllib->rtllib_ips_leave) priv->rtllib->rtllib_ips_leave(dev);
priv->rtllib->rtllib_ips_leave(dev);
if (priv->rtllib->state == RTLLIB_LINKED) if (priv->rtllib->state == RTLLIB_LINKED)
rtl92e_leisure_ps_leave(dev); rtl92e_leisure_ps_leave(dev);
......
...@@ -432,15 +432,11 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, ...@@ -432,15 +432,11 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
if (priv->rtllib->rf_power_state != rf_off) { if (priv->rtllib->rf_power_state != rf_off) {
priv->rtllib->actscanning = true; priv->rtllib->actscanning = true;
if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
ieee->ScanOperationBackupHandler(ieee->dev,
SCAN_OPT_BACKUP);
rtllib_start_scan_syncro(priv->rtllib, 0); rtllib_start_scan_syncro(priv->rtllib, 0);
if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE);
ieee->ScanOperationBackupHandler(ieee->dev,
SCAN_OPT_RESTORE);
} }
ret = 0; ret = 0;
} else { } else {
......
...@@ -1572,8 +1572,7 @@ static void rtllib_associate_procedure_wq(void *data) ...@@ -1572,8 +1572,7 @@ static void rtllib_associate_procedure_wq(void *data)
struct rtllib_device, struct rtllib_device,
associate_procedure_wq); associate_procedure_wq);
rtllib_stop_scan_syncro(ieee); rtllib_stop_scan_syncro(ieee);
if (ieee->rtllib_ips_leave != NULL) ieee->rtllib_ips_leave(ieee->dev);
ieee->rtllib_ips_leave(ieee->dev);
mutex_lock(&ieee->wx_mutex); mutex_lock(&ieee->wx_mutex);
if (ieee->data_hard_stop) if (ieee->data_hard_stop)
...@@ -2850,8 +2849,7 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) ...@@ -2850,8 +2849,7 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown)
if (shutdown) { if (shutdown) {
ieee->proto_started = 0; ieee->proto_started = 0;
ieee->proto_stoppping = 1; ieee->proto_stoppping = 1;
if (ieee->rtllib_ips_leave != NULL) ieee->rtllib_ips_leave(ieee->dev);
ieee->rtllib_ips_leave(ieee->dev);
} }
rtllib_stop_send_beacons(ieee); rtllib_stop_send_beacons(ieee);
......
...@@ -355,8 +355,7 @@ void rtllib_wx_sync_scan_wq(void *data) ...@@ -355,8 +355,7 @@ void rtllib_wx_sync_scan_wq(void *data)
/* wait for ps packet to be kicked out successfully */ /* wait for ps packet to be kicked out successfully */
msleep(50); msleep(50);
if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht && if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht &&
ieee->ht_info->bCurBW40MHz) { ieee->ht_info->bCurBW40MHz) {
...@@ -381,8 +380,7 @@ void rtllib_wx_sync_scan_wq(void *data) ...@@ -381,8 +380,7 @@ void rtllib_wx_sync_scan_wq(void *data)
ieee->set_chan(ieee->dev, chan); ieee->set_chan(ieee->dev, chan);
} }
if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE);
ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE);
ieee->state = RTLLIB_LINKED; ieee->state = RTLLIB_LINKED;
ieee->link_change(ieee->dev); ieee->link_change(ieee->dev);
......
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