diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-ucode.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-ucode.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c index ba7c9f883cb6..539171945610 100644 --- a/drivers/net/wireless/iwlwifi/iwl-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c | |||
@@ -62,7 +62,7 @@ static int iwl_set_Xtal_calib(struct iwl_priv *priv) | |||
62 | { | 62 | { |
63 | struct iwl_calib_xtal_freq_cmd cmd; | 63 | struct iwl_calib_xtal_freq_cmd cmd; |
64 | __le16 *xtal_calib = | 64 | __le16 *xtal_calib = |
65 | (__le16 *)iwl_eeprom_query_addr(priv->shrd, EEPROM_XTAL); | 65 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_XTAL); |
66 | 66 | ||
67 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD); | 67 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD); |
68 | cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]); | 68 | cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]); |
@@ -74,8 +74,7 @@ static int iwl_set_temperature_offset_calib(struct iwl_priv *priv) | |||
74 | { | 74 | { |
75 | struct iwl_calib_temperature_offset_cmd cmd; | 75 | struct iwl_calib_temperature_offset_cmd cmd; |
76 | __le16 *offset_calib = | 76 | __le16 *offset_calib = |
77 | (__le16 *)iwl_eeprom_query_addr(priv->shrd, | 77 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE); |
78 | EEPROM_RAW_TEMPERATURE); | ||
79 | 78 | ||
80 | memset(&cmd, 0, sizeof(cmd)); | 79 | memset(&cmd, 0, sizeof(cmd)); |
81 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD); | 80 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD); |
@@ -91,16 +90,15 @@ static int iwl_set_temperature_offset_calib(struct iwl_priv *priv) | |||
91 | static int iwl_set_temperature_offset_calib_v2(struct iwl_priv *priv) | 90 | static int iwl_set_temperature_offset_calib_v2(struct iwl_priv *priv) |
92 | { | 91 | { |
93 | struct iwl_calib_temperature_offset_v2_cmd cmd; | 92 | struct iwl_calib_temperature_offset_v2_cmd cmd; |
94 | __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv->shrd, | 93 | __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv, |
95 | EEPROM_KELVIN_TEMPERATURE); | 94 | EEPROM_KELVIN_TEMPERATURE); |
96 | __le16 *offset_calib_low = | 95 | __le16 *offset_calib_low = |
97 | (__le16 *)iwl_eeprom_query_addr(priv->shrd, | 96 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE); |
98 | EEPROM_RAW_TEMPERATURE); | ||
99 | struct iwl_eeprom_calib_hdr *hdr; | 97 | struct iwl_eeprom_calib_hdr *hdr; |
100 | 98 | ||
101 | memset(&cmd, 0, sizeof(cmd)); | 99 | memset(&cmd, 0, sizeof(cmd)); |
102 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD); | 100 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD); |
103 | hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv->shrd, | 101 | hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv, |
104 | EEPROM_CALIB_ALL); | 102 | EEPROM_CALIB_ALL); |
105 | memcpy(&cmd.radio_sensor_offset_high, offset_calib_high, | 103 | memcpy(&cmd.radio_sensor_offset_high, offset_calib_high, |
106 | sizeof(*offset_calib_high)); | 104 | sizeof(*offset_calib_high)); |
@@ -180,7 +178,7 @@ int iwl_init_alive_start(struct iwl_priv *priv) | |||
180 | return 0; | 178 | return 0; |
181 | } | 179 | } |
182 | 180 | ||
183 | static int iwl_send_wimax_coex(struct iwl_priv *priv) | 181 | int iwl_send_wimax_coex(struct iwl_priv *priv) |
184 | { | 182 | { |
185 | struct iwl_wimax_coex_cmd coex_cmd; | 183 | struct iwl_wimax_coex_cmd coex_cmd; |
186 | 184 | ||