staging: rtl8723bs: Remove unused structs and helper functions

Remove structs rtw_wdev_invit_info and rtw_wdev_nego_info along with
their initializer macros as they are never used anywhere in the driver.

Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
Link: https://patch.msgid.link/20260209230936.37385-2-ethantidmore06@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/include/ioctl_cfg80211.h b/drivers/staging/rtl8723bs/include/ioctl_cfg80211.h
index 753009b074511a6bae6d5c22e93732cd6b159ab2..782f79e9228aa7d7766a93a583dd27df4285fc6d 100644 (file)
--- a/drivers/staging/rtl8723bs/include/ioctl_cfg80211.h
+++ b/drivers/staging/rtl8723bs/include/ioctl_cfg80211.h
@@ -7,58 +7,6 @@
 #ifndef __IOCTL_CFG80211_H__
 #define __IOCTL_CFG80211_H__
 
-struct rtw_wdev_invit_info {
-       u8 state; /* 0: req, 1:rep */
-       u8 peer_mac[ETH_ALEN];
-       u8 active;
-       u8 token;
-       u8 flags;
-       u8 status;
-       u8 req_op_ch;
-       u8 rsp_op_ch;
-};
-
-#define rtw_wdev_invit_info_init(invit_info) \
-       do { \
-               (invit_info)->state = 0xff; \
-               memset((invit_info)->peer_mac, 0, ETH_ALEN); \
-               (invit_info)->active = 0xff; \
-               (invit_info)->token = 0; \
-               (invit_info)->flags = 0x00; \
-               (invit_info)->status = 0xff; \
-               (invit_info)->req_op_ch = 0; \
-               (invit_info)->rsp_op_ch = 0; \
-       } while (0)
-
-struct rtw_wdev_nego_info {
-       u8 state; /* 0: req, 1:rep, 2:conf */
-       u8 peer_mac[ETH_ALEN];
-       u8 active;
-       u8 token;
-       u8 status;
-       u8 req_intent;
-       u8 req_op_ch;
-       u8 req_listen_ch;
-       u8 rsp_intent;
-       u8 rsp_op_ch;
-       u8 conf_op_ch;
-};
-
-#define rtw_wdev_nego_info_init(nego_info) \
-       do { \
-               (nego_info)->state = 0xff; \
-               memset((nego_info)->peer_mac, 0, ETH_ALEN); \
-               (nego_info)->active = 0xff; \
-               (nego_info)->token = 0; \
-               (nego_info)->status = 0xff; \
-               (nego_info)->req_intent = 0xff; \
-               (nego_info)->req_op_ch = 0; \
-               (nego_info)->req_listen_ch = 0; \
-               (nego_info)->rsp_intent = 0xff; \
-               (nego_info)->rsp_op_ch = 0; \
-               (nego_info)->conf_op_ch = 0; \
-       } while (0)
-
 struct rtw_wdev_priv {
        struct wireless_dev *rtw_wdev;
 
@@ -74,9 +22,6 @@ struct rtw_wdev_priv {
 
        u8 provdisc_req_issued;
 
-       struct rtw_wdev_invit_info invit_info;
-       struct rtw_wdev_nego_info nego_info;
-
        u8 bandroid_scan;
        bool block;
        bool power_mgmt;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 83701ff874113880306a8b9e51de496bb0e352a3..d83924c6f54beb2275c97304f9053a02d942e726 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -2751,8 +2751,6 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev)
 
        pwdev_priv->p2p_enabled = false;
        pwdev_priv->provdisc_req_issued = false;
-       rtw_wdev_invit_info_init(&pwdev_priv->invit_info);
-       rtw_wdev_nego_info_init(&pwdev_priv->nego_info);
 
        pwdev_priv->bandroid_scan = false;