wifi: wilc1000: cleanup struct wilc_conn_info

Remove set but otherwise unused 'ch' member of 'struct wilc_conn_info'
and avoid typeless 'void *' pointers in '(*conn_result)()' callback.
Likewise for 'wilc_parse_join_bss_param()'. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231031171330.70399-1-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
index bf2a6053350602cd68d73b089547516fd445f7fc..af6d17724bf379b974269f51f15a39d0a20e7bcd 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -162,9 +162,8 @@ static void cfg_scan_result(enum scan_event scan_event,
 }
 
 static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status,
-                              void *priv_data)
+                              struct wilc_priv *priv)
 {
-       struct wilc_priv *priv = priv_data;
        struct net_device *dev = priv->dev;
        struct wilc_vif *vif = netdev_priv(dev);
        struct wilc *wl = vif->wilc;
@@ -412,9 +411,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 
        wfi_drv->conn_info.security = security;
        wfi_drv->conn_info.auth_type = auth_type;
-       wfi_drv->conn_info.ch = ch;
        wfi_drv->conn_info.conn_result = cfg_connect_result;
-       wfi_drv->conn_info.arg = priv;
+       wfi_drv->conn_info.priv = priv;
        wfi_drv->conn_info.param = join_params;
 
        if (sme->mfp == NL80211_MFP_OPTIONAL)

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c
index 2c42683dd5fb3620ab456469c32bb4211659c1af..a5115227644ba9aac9e761f19a8abf8541348559 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -348,7 +348,7 @@ static void handle_connect_timeout(struct work_struct *work)
        if (hif_drv->conn_info.conn_result) {
                hif_drv->conn_info.conn_result(CONN_DISCONN_EVENT_CONN_RESP,
                                               WILC_MAC_STATUS_DISCONNECTED,
-                                              hif_drv->conn_info.arg);
+                                              hif_drv->conn_info.priv);
 
        } else {
                netdev_err(vif->ndev, "%s: conn_result is NULL\n", __func__);
@@ -371,8 +371,9 @@ out:
        kfree(msg);
 }
 
-void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
-                               struct cfg80211_crypto_settings *crypto)
+struct wilc_join_bss_param *
+wilc_parse_join_bss_param(struct cfg80211_bss *bss,
+                         struct cfg80211_crypto_settings *crypto)
 {
        struct wilc_join_bss_param *param;
        struct ieee80211_p2p_noa_attr noa_attr;
@@ -627,7 +628,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
 
        del_timer(&hif_drv->connect_timer);
        conn_info->conn_result(CONN_DISCONN_EVENT_CONN_RESP, mac_status,
-                              hif_drv->conn_info.arg);
+                              hif_drv->conn_info.priv);
 
        if (mac_status == WILC_MAC_STATUS_CONNECTED &&
            conn_info->status == WLAN_STATUS_SUCCESS) {
@@ -657,7 +658,7 @@ void wilc_handle_disconnect(struct wilc_vif *vif)
 
        if (hif_drv->conn_info.conn_result)
                hif_drv->conn_info.conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF,
-                                              0, hif_drv->conn_info.arg);
+                                              0, hif_drv->conn_info.priv);
 
        eth_zero_addr(hif_drv->assoc_bssid);
 
@@ -739,7 +740,7 @@ int wilc_disconnect(struct wilc_vif *vif)
                        del_timer(&hif_drv->connect_timer);
 
                conn_info->conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF, 0,
-                                      conn_info->arg);
+                                      conn_info->priv);
        } else {
                netdev_err(vif->ndev, "%s: conn_result is NULL\n", __func__);
        }

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wireless/microchip/wilc1000/hif.h
index b0cb35590027faa60094e6b4b0381526710db538..07f81c7c51309254f2d56e96f6a042c50c71e117 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/hif.h
+++ b/drivers/net/wireless/microchip/wilc1000/hif.h
@@ -95,6 +95,7 @@ struct wilc_rcvd_net_info {
        struct ieee80211_mgmt *mgmt;
 };
 
+struct wilc_priv;
 struct wilc_user_scan_req {
        void (*scan_result)(enum scan_event evt,
                            struct wilc_rcvd_net_info *info, void *priv);
@@ -102,20 +103,21 @@ struct wilc_user_scan_req {
        u32 ch_cnt;
 };
 
+struct wilc_join_bss_param;
 struct wilc_conn_info {
        u8 bssid[ETH_ALEN];
        u8 security;
        enum authtype auth_type;
        enum mfptype mfp_type;
-       u8 ch;
        u8 *req_ies;
        size_t req_ies_len;
        u8 *resp_ies;
        u16 resp_ies_len;
        u16 status;
-       void (*conn_result)(enum conn_event evt, u8 status, void *priv_data);
-       void *arg;
-       void *param;
+       void (*conn_result)(enum conn_event evt, u8 status,
+                           struct wilc_priv *priv);
+       struct wilc_priv *priv;
+       struct wilc_join_bss_param *param;
 };
 
 struct wilc_vif;
@@ -207,8 +209,9 @@ int wilc_set_external_auth_param(struct wilc_vif *vif,
 void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length);
 void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length);
 void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length);
-void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
-                               struct cfg80211_crypto_settings *crypto);
+struct wilc_join_bss_param *
+wilc_parse_join_bss_param(struct cfg80211_bss *bss,
+                         struct cfg80211_crypto_settings *crypto);
 int wilc_set_default_mgmt_key_index(struct wilc_vif *vif, u8 index);
 void wilc_handle_disconnect(struct wilc_vif *vif);