Commit 6d4dec7b authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy

iwlwifi: iwl_set_hw_params returns always 0

Remove the return value.
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 78e5a464
...@@ -120,7 +120,7 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = { ...@@ -120,7 +120,7 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = {
.nrg_th_cca = 62, .nrg_th_cca = 62,
}; };
static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES && if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&
iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES) iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
...@@ -146,8 +146,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -146,8 +146,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
hw_params(priv).sens = &iwl1000_sensitivity; hw_params(priv).sens = &iwl1000_sensitivity;
return 0;
} }
static struct iwl_lib_ops iwl1000_lib = { static struct iwl_lib_ops iwl1000_lib = {
......
...@@ -116,7 +116,7 @@ static struct iwl_sensitivity_ranges iwl2000_sensitivity = { ...@@ -116,7 +116,7 @@ static struct iwl_sensitivity_ranges iwl2000_sensitivity = {
.nrg_th_cca = 62, .nrg_th_cca = 62,
}; };
static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES && if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&
iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES) iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
...@@ -142,8 +142,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -142,8 +142,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
hw_params(priv).sens = &iwl2000_sensitivity; hw_params(priv).sens = &iwl2000_sensitivity;
return 0;
} }
static struct iwl_lib_ops iwl2000_lib = { static struct iwl_lib_ops iwl2000_lib = {
......
...@@ -162,7 +162,7 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv) ...@@ -162,7 +162,7 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY; hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
} }
static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES && if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&
iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES) iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
...@@ -185,11 +185,9 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -185,11 +185,9 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
hw_params(priv).sens = &iwl5000_sensitivity; hw_params(priv).sens = &iwl5000_sensitivity;
return 0;
} }
static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES && if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&
iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES) iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
...@@ -212,8 +210,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) ...@@ -212,8 +210,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
hw_params(priv).sens = &iwl5150_sensitivity; hw_params(priv).sens = &iwl5150_sensitivity;
return 0;
} }
static void iwl5150_temperature(struct iwl_priv *priv) static void iwl5150_temperature(struct iwl_priv *priv)
......
...@@ -137,7 +137,7 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = { ...@@ -137,7 +137,7 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = {
.nrg_th_cca = 62, .nrg_th_cca = 62,
}; };
static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES && if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&
iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES) iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
...@@ -165,7 +165,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -165,7 +165,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
hw_params(priv).sens = &iwl6000_sensitivity; hw_params(priv).sens = &iwl6000_sensitivity;
return 0;
} }
static int iwl6000_hw_channel_switch(struct iwl_priv *priv, static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
......
...@@ -1082,7 +1082,7 @@ static void iwl_uninit_drv(struct iwl_priv *priv) ...@@ -1082,7 +1082,7 @@ static void iwl_uninit_drv(struct iwl_priv *priv)
#define IWL_RX_BUF_SIZE_4K (4 * 1024) #define IWL_RX_BUF_SIZE_4K (4 * 1024)
#define IWL_RX_BUF_SIZE_8K (8 * 1024) #define IWL_RX_BUF_SIZE_8K (8 * 1024)
static int iwl_set_hw_params(struct iwl_priv *priv) static void iwl_set_hw_params(struct iwl_priv *priv)
{ {
if (iwlagn_mod_params.amsdu_size_8K) if (iwlagn_mod_params.amsdu_size_8K)
hw_params(priv).rx_page_order = hw_params(priv).rx_page_order =
...@@ -1102,7 +1102,7 @@ static int iwl_set_hw_params(struct iwl_priv *priv) ...@@ -1102,7 +1102,7 @@ static int iwl_set_hw_params(struct iwl_priv *priv)
hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout; hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout;
/* Device-specific setup */ /* Device-specific setup */
return cfg(priv)->lib->set_hw_params(priv); cfg(priv)->lib->set_hw_params(priv);
} }
...@@ -1239,11 +1239,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, ...@@ -1239,11 +1239,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
/************************ /************************
* 5. Setup HW constants * 5. Setup HW constants
************************/ ************************/
if (iwl_set_hw_params(priv)) { iwl_set_hw_params(priv);
err = -ENOENT;
IWL_ERR(priv, "failed to set hw parameters\n");
goto out_free_eeprom;
}
/******************* /*******************
* 6. Setup priv * 6. Setup priv
......
...@@ -76,7 +76,7 @@ struct iwl_cmd; ...@@ -76,7 +76,7 @@ struct iwl_cmd;
struct iwl_lib_ops { struct iwl_lib_ops {
/* set hw dependent parameters */ /* set hw dependent parameters */
int (*set_hw_params)(struct iwl_priv *priv); void (*set_hw_params)(struct iwl_priv *priv);
/* setup BT Rx handler */ /* setup BT Rx handler */
void (*bt_rx_handler_setup)(struct iwl_priv *priv); void (*bt_rx_handler_setup)(struct iwl_priv *priv);
/* setup BT related deferred work */ /* setup BT related deferred work */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment