iwlwifi: scan: Modify return value of a function
authorIlan Peer <ilan.peer@intel.com>
Fri, 4 Feb 2022 10:25:02 +0000 (12:25 +0200)
committerLuca Coelho <luciano.coelho@intel.com>
Fri, 18 Feb 2022 08:40:53 +0000 (10:40 +0200)
The function iwl_mvm_umac_scan_fill_6g_chan_list() always returns 0.
Change its return value to 'void'.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220204122220.caef72dc255c.I186b787c7f190ca00c2800e1035f2503360f58a8@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/scan.c

index 4b78a00..8c7cb49 100644 (file)
@@ -1656,7 +1656,7 @@ iwl_mvm_umac_scan_cfg_channels_v6(struct iwl_mvm *mvm,
        }
 }
 
-static int
+static void
 iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,
                                    struct iwl_mvm_scan_params *params,
                                     struct iwl_scan_probe_params_v4 *pp)
@@ -1725,7 +1725,6 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,
 
        pp->short_ssid_num = idex_s;
        pp->bssid_num = idex_b;
-       return 0;
 }
 
 /* TODO: this function can be merged with iwl_mvm_scan_umac_fill_ch_p_v6 */
@@ -2414,9 +2413,7 @@ static int iwl_mvm_scan_umac_v14_and_above(struct iwl_mvm *mvm,
        cp->n_aps_override[0] = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY;
        cp->n_aps_override[1] = IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS;
 
-       ret = iwl_mvm_umac_scan_fill_6g_chan_list(mvm, params, pb);
-       if (ret)
-               return ret;
+       iwl_mvm_umac_scan_fill_6g_chan_list(mvm, params, pb);
 
        iwl_mvm_umac_scan_cfg_channels_v6_6g(params,
                                             params->n_channels,