staging: rtl8192e: Remove functions rtllib_start_hw_scan and stop
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Sat, 13 May 2023 18:08:56 +0000 (20:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 May 2023 09:11:12 +0000 (10:11 +0100)
Remove functions rtllib_start_hw_scan and rtllib_stop_hw_scan as they are
not defined.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/868524470321b8936f63d3ea06ba86c34fc89bb7.1683960684.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtllib.h
drivers/staging/rtl8192e/rtllib_softmac.c

index 9b49a15de889d452ec90e058005538b0faec134f..aac71fda45411ef99cf8ca8069b120f0d4e8e4a6 100644 (file)
@@ -1688,9 +1688,6 @@ struct rtllib_device {
         */
        void (*set_chan)(struct net_device *dev, short ch);
 
-       void (*rtllib_start_hw_scan)(struct net_device *dev);
-       void (*rtllib_stop_hw_scan)(struct net_device *dev);
-
        /* indicate the driver that the link state is changed
         * for example it may indicate the card is associated now.
         * Driver might be interested in this to apply RX filter
index fe36a52b4c9173a0ee4c5d8d60e6f4bc8c7f7b69..bb28414b88bc10372c719225156e5f3830797763 100644 (file)
@@ -691,23 +691,15 @@ static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)
 
 void rtllib_stop_scan(struct rtllib_device *ieee)
 {
-       if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) {
+       if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
                rtllib_softmac_stop_scan(ieee);
-       } else {
-               if (ieee->rtllib_stop_hw_scan)
-                       ieee->rtllib_stop_hw_scan(ieee->dev);
-       }
 }
 EXPORT_SYMBOL(rtllib_stop_scan);
 
 void rtllib_stop_scan_syncro(struct rtllib_device *ieee)
 {
-       if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) {
+       if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
                ieee->sync_scan_hurryup = 1;
-       } else {
-               if (ieee->rtllib_stop_hw_scan)
-                       ieee->rtllib_stop_hw_scan(ieee->dev);
-       }
 }
 EXPORT_SYMBOL(rtllib_stop_scan_syncro);
 
@@ -739,9 +731,6 @@ static void rtllib_start_scan(struct rtllib_device *ieee)
                        ieee->scanning_continue = 1;
                        schedule_delayed_work(&ieee->softmac_scan_wq, 0);
                }
-       } else {
-               if (ieee->rtllib_start_hw_scan)
-                       ieee->rtllib_start_hw_scan(ieee->dev);
        }
 }
 
@@ -753,12 +742,8 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
                        RESET_CIE_WATCHDOG(ieee);
        }
        ieee->sync_scan_hurryup = 0;
-       if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) {
+       if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
                rtllib_softmac_scan_syncro(ieee, is_mesh);
-       } else {
-               if (ieee->rtllib_start_hw_scan)
-                       ieee->rtllib_start_hw_scan(ieee->dev);
-       }
 }
 EXPORT_SYMBOL(rtllib_start_scan_syncro);