wifi: wilc1000: simplify wilc_scan()

Simplify 'wilc_scan()' assuming 'struct wilc_priv *' is the only data
passed to '(*scan_result)()' callback and thus avoid typeless 'void *'
pointers in related code, including 'struct wilc_user_scan_req'.
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-2-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
index af6d17724bf379b974269f51f15a39d0a20e7bcd..ad2509d8c99a443277f308802caa3b339259fe0b 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -105,10 +105,9 @@ struct wilc_ch_list_elem {
 } __packed;
 
 static void cfg_scan_result(enum scan_event scan_event,
-                           struct wilc_rcvd_net_info *info, void *user_void)
+                           struct wilc_rcvd_net_info *info,
+                           struct wilc_priv *priv)
 {
-       struct wilc_priv *priv = user_void;
-
        if (!priv->cfg_scanning)
                return;
 
@@ -285,9 +284,8 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
        else
                scan_type = WILC_FW_PASSIVE_SCAN;
 
-       ret = wilc_scan(vif, WILC_FW_USER_SCAN, scan_type, scan_ch_list,
-                       request->n_channels, cfg_scan_result, (void *)priv,
-                       request);
+       ret = wilc_scan(vif, WILC_FW_USER_SCAN, scan_type,
+                       scan_ch_list, cfg_scan_result, request);
 
        if (ret) {
                priv->scan_req = NULL;

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c
index a5115227644ba9aac9e761f19a8abf8541348559..839f142663e8646bbcc85498a2e1123640ec5ac6 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -144,18 +144,19 @@ static int handle_scan_done(struct wilc_vif *vif, enum scan_event evt)
 
        scan_req = &hif_drv->usr_scan_req;
        if (scan_req->scan_result) {
-               scan_req->scan_result(evt, NULL, scan_req->arg);
+               scan_req->scan_result(evt, NULL, scan_req->priv);
                scan_req->scan_result = NULL;
        }
 
        return result;
 }
 
-int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
-             u8 *ch_freq_list, u8 ch_list_len,
+int wilc_scan(struct wilc_vif *vif, u8 scan_source,
+             u8 scan_type, u8 *ch_freq_list,
              void (*scan_result_fn)(enum scan_event,
-                                    struct wilc_rcvd_net_info *, void *),
-             void *user_arg, struct cfg80211_scan_request *request)
+                                    struct wilc_rcvd_net_info *,
+                                    struct wilc_priv *),
+             struct cfg80211_scan_request *request)
 {
        int result = 0;
        struct wid wid_list[WILC_SCAN_WID_LIST_SIZE];
@@ -164,6 +165,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
        u8 *buffer;
        u8 valuesize = 0;
        u8 *search_ssid_vals = NULL;
+       const u8 ch_list_len = request->n_channels;
        struct host_if_drv *hif_drv = vif->hif_drv;
 
        if (hif_drv->hif_state >= HOST_IF_SCANNING &&
@@ -249,7 +251,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
        index++;
 
        hif_drv->usr_scan_req.scan_result = scan_result_fn;
-       hif_drv->usr_scan_req.arg = user_arg;
+       hif_drv->usr_scan_req.priv = &vif->priv;
 
        result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, index);
        if (result) {
@@ -546,7 +548,7 @@ static void handle_rcvd_ntwrk_info(struct work_struct *work)
 
        if (scan_req->scan_result)
                scan_req->scan_result(SCAN_EVENT_NETWORK_FOUND, rcvd_info,
-                                     scan_req->arg);
+                                     scan_req->priv);
 
 done:
        kfree(rcvd_info->mgmt);
@@ -730,7 +732,7 @@ int wilc_disconnect(struct wilc_vif *vif)
 
        if (scan_req->scan_result) {
                del_timer(&hif_drv->scan_timer);
-               scan_req->scan_result(SCAN_EVENT_ABORTED, NULL, scan_req->arg);
+               scan_req->scan_result(SCAN_EVENT_ABORTED, NULL, scan_req->priv);
                scan_req->scan_result = NULL;
        }
 
@@ -1539,7 +1541,7 @@ int wilc_deinit(struct wilc_vif *vif)
 
        if (hif_drv->usr_scan_req.scan_result) {
                hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL,
-                                                 hif_drv->usr_scan_req.arg);
+                                                 hif_drv->usr_scan_req.priv);
                hif_drv->usr_scan_req.scan_result = NULL;
        }
 

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.h b/drivers/net/wireless/microchip/wilc1000/hif.h
index 07f81c7c51309254f2d56e96f6a042c50c71e117..0d380586b1d9c91b71a37e9774ea6378c9276b5b 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/hif.h
+++ b/drivers/net/wireless/microchip/wilc1000/hif.h
@@ -98,8 +98,9 @@ struct wilc_rcvd_net_info {
 struct wilc_priv;
 struct wilc_user_scan_req {
        void (*scan_result)(enum scan_event evt,
-                           struct wilc_rcvd_net_info *info, void *priv);
-       void *arg;
+                           struct wilc_rcvd_net_info *info,
+                           struct wilc_priv *priv);
+       struct wilc_priv *priv;
        u32 ch_cnt;
 };
 
@@ -172,11 +173,12 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ies,
 int wilc_disconnect(struct wilc_vif *vif);
 int wilc_set_mac_chnl_num(struct wilc_vif *vif, u8 channel);
 int wilc_get_rssi(struct wilc_vif *vif, s8 *rssi_level);
-int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
-             u8 *ch_freq_list, u8 ch_list_len,
+int wilc_scan(struct wilc_vif *vif, u8 scan_source,
+             u8 scan_type, u8 *ch_freq_list,
              void (*scan_result_fn)(enum scan_event,
-                                    struct wilc_rcvd_net_info *, void *),
-             void *user_arg, struct cfg80211_scan_request *request);
+                                    struct wilc_rcvd_net_info *,
+                                    struct wilc_priv *),
+             struct cfg80211_scan_request *request);
 int wilc_hif_set_cfg(struct wilc_vif *vif,
                     struct cfg_param_attr *cfg_param);
 int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler);