From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 3/9] staging: rtl8192e: Remove functions rtllib_start_hw_scan and stop
Date: Sat, 13 May 2023 20:08:56 +0200 [thread overview]
Message-ID: <868524470321b8936f63d3ea06ba86c34fc89bb7.1683960684.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1683960684.git.philipp.g.hortmann@gmail.com>
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>
---
drivers/staging/rtl8192e/rtllib.h | 3 ---
drivers/staging/rtl8192e/rtllib_softmac.c | 21 +++------------------
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 9b49a15de889..aac71fda4541 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -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
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index fe36a52b4c91..bb28414b88bc 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -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);
--
2.40.1
next prev parent reply other threads:[~2023-05-13 18:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-13 18:08 [PATCH 0/9] staging: rtl8192e: Remove undefined functions like data_hard_stop Philipp Hortmann
2023-05-13 18:08 ` [PATCH 1/9] staging: rtl8192e: Remove undefined function data_hard_stop Philipp Hortmann
2023-05-13 18:08 ` [PATCH 2/9] staging: rtl8192e: Remove undefined function data_hard_resume Philipp Hortmann
2023-05-13 18:08 ` Philipp Hortmann [this message]
2023-05-13 18:09 ` [PATCH 4/9] staging: rtl8192e: Remove undefined function reset_port Philipp Hortmann
2023-05-13 18:09 ` [PATCH 5/9] staging: rtl8192e: Remove undefined function hard_start_xmit Philipp Hortmann
2023-05-13 18:09 ` [PATCH 6/9] staging: rtl8192e: Remove undefined function set_security Philipp Hortmann
2023-05-13 18:09 ` [PATCH 7/9] staging: rtl8192e: Remove undefined function SetFwCmdHandler Philipp Hortmann
2023-05-13 18:09 ` [PATCH 8/9] staging: rtl8192e: Remove undefined function UpdateBeaconInterruptHandler Philipp Hortmann
2023-05-13 18:09 ` [PATCH 9/9] staging: rtl8192e: Remove undefined function LedControlHandler Philipp Hortmann
2023-05-28 6:38 ` staging: rtl8192e: Replace drivers rtllib_crypt_ccmp_... with lib80211_crypt_ Philipp Hortmann
2023-05-28 18:37 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=868524470321b8936f63d3ea06ba86c34fc89bb7.1683960684.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®