Commit d7b6b6a6 authored by Greg Dietsche's avatar Greg Dietsche Committed by John W. Linville

iwlegacy: remove enum iw_calib and related code

Remove the enum il_calib. It defined one identifier: IL_CALIB_MAX.
Remove the function il4965_calib_free_results. It was doing nothing
because IL_CALIB_MAX is zero. Next, remove calib_results from the
il_priv structure and also remove the associated return
type/struct il_calib_result.
Signed-off-by: default avatarGreg Dietsche <Gregory.Dietsche@cuw.edu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 08db1ab7
...@@ -79,18 +79,6 @@ struct stats_general_data { ...@@ -79,18 +79,6 @@ struct stats_general_data {
u32 beacon_energy_c; u32 beacon_energy_c;
}; };
void
il4965_calib_free_results(struct il_priv *il)
{
int i;
for (i = 0; i < IL_CALIB_MAX; i++) {
kfree(il->calib_results[i].buf);
il->calib_results[i].buf = NULL;
il->calib_results[i].buf_len = 0;
}
}
/***************************************************************************** /*****************************************************************************
* RUNTIME calibrations framework * RUNTIME calibrations framework
*****************************************************************************/ *****************************************************************************/
......
...@@ -6347,7 +6347,6 @@ il4965_init_drv(struct il_priv *il) ...@@ -6347,7 +6347,6 @@ il4965_init_drv(struct il_priv *il)
static void static void
il4965_uninit_drv(struct il_priv *il) il4965_uninit_drv(struct il_priv *il)
{ {
il4965_calib_free_results(il);
il_free_geos(il); il_free_geos(il);
il_free_channel_map(il); il_free_channel_map(il);
kfree(il->scan_cmd); kfree(il->scan_cmd);
......
...@@ -927,7 +927,6 @@ void il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp); ...@@ -927,7 +927,6 @@ void il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp);
void il4965_sensitivity_calibration(struct il_priv *il, void *resp); void il4965_sensitivity_calibration(struct il_priv *il, void *resp);
void il4965_init_sensitivity(struct il_priv *il); void il4965_init_sensitivity(struct il_priv *il);
void il4965_reset_run_time_calib(struct il_priv *il); void il4965_reset_run_time_calib(struct il_priv *il);
void il4965_calib_free_results(struct il_priv *il);
/* Debug */ /* Debug */
#ifdef CONFIG_IWLEGACY_DEBUGFS #ifdef CONFIG_IWLEGACY_DEBUGFS
......
...@@ -961,21 +961,6 @@ enum il4965_calib_enabled_state { ...@@ -961,21 +961,6 @@ enum il4965_calib_enabled_state {
IL_CALIB_ENABLED = 1, IL_CALIB_ENABLED = 1,
}; };
/*
* enum il_calib
* defines the order in which results of initial calibrations
* should be sent to the runtime uCode
*/
enum il_calib {
IL_CALIB_MAX,
};
/* Opaque calibration results */
struct il_calib_result {
void *buf;
size_t buf_len;
};
enum ucode_type { enum ucode_type {
UCODE_NONE = 0, UCODE_NONE = 0,
UCODE_INIT, UCODE_INIT,
...@@ -1195,9 +1180,6 @@ struct il_priv { ...@@ -1195,9 +1180,6 @@ struct il_priv {
s32 temperature; /* degrees Kelvin */ s32 temperature; /* degrees Kelvin */
s32 last_temperature; s32 last_temperature;
/* init calibration results */
struct il_calib_result calib_results[IL_CALIB_MAX];
/* Scan related variables */ /* Scan related variables */
unsigned long scan_start; unsigned long scan_start;
unsigned long scan_start_tsf; unsigned long scan_start_tsf;
......
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