diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-05-27 11:40:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-01 15:36:31 -0400 |
commit | 5beaaf3756aef42f31747d81b0676c8ccf59c6c4 (patch) | |
tree | f34af5d7d994a8fa7fc1802db14f9410de4f2341 /drivers | |
parent | 891db88112b604db054d9575d200271ad97634a4 (diff) |
iwlagn: remove un-necessary tx power ops
All agn devices use the same tx power function, remove the ops
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-2000.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 1 |
6 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 61d4a11f566..99409501ad4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
@@ -174,7 +174,6 @@ static struct iwl_lib_ops iwl1000_lib = { | |||
174 | .rx_handler_setup = iwlagn_rx_handler_setup, | 174 | .rx_handler_setup = iwlagn_rx_handler_setup, |
175 | .setup_deferred_work = iwlagn_setup_deferred_work, | 175 | .setup_deferred_work = iwlagn_setup_deferred_work, |
176 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 176 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
177 | .send_tx_power = iwlagn_send_tx_power, | ||
178 | .update_chain_flags = iwl_update_chain_flags, | 177 | .update_chain_flags = iwl_update_chain_flags, |
179 | .apm_ops = { | 178 | .apm_ops = { |
180 | .init = iwl_apm_init, | 179 | .init = iwl_apm_init, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index 86feec86d13..a37c41b405c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
@@ -256,7 +256,6 @@ static struct iwl_lib_ops iwl2000_lib = { | |||
256 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, | 256 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, |
257 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, | 257 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, |
258 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 258 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
259 | .send_tx_power = iwlagn_send_tx_power, | ||
260 | .update_chain_flags = iwl_update_chain_flags, | 259 | .update_chain_flags = iwl_update_chain_flags, |
261 | .set_channel_switch = iwl2030_hw_channel_switch, | 260 | .set_channel_switch = iwl2030_hw_channel_switch, |
262 | .apm_ops = { | 261 | .apm_ops = { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index a70b8cfafda..a8dbbd08279 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -342,7 +342,6 @@ static struct iwl_lib_ops iwl5000_lib = { | |||
342 | .rx_handler_setup = iwlagn_rx_handler_setup, | 342 | .rx_handler_setup = iwlagn_rx_handler_setup, |
343 | .setup_deferred_work = iwlagn_setup_deferred_work, | 343 | .setup_deferred_work = iwlagn_setup_deferred_work, |
344 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 344 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
345 | .send_tx_power = iwlagn_send_tx_power, | ||
346 | .update_chain_flags = iwl_update_chain_flags, | 345 | .update_chain_flags = iwl_update_chain_flags, |
347 | .set_channel_switch = iwl5000_hw_channel_switch, | 346 | .set_channel_switch = iwl5000_hw_channel_switch, |
348 | .apm_ops = { | 347 | .apm_ops = { |
@@ -373,7 +372,6 @@ static struct iwl_lib_ops iwl5150_lib = { | |||
373 | .rx_handler_setup = iwlagn_rx_handler_setup, | 372 | .rx_handler_setup = iwlagn_rx_handler_setup, |
374 | .setup_deferred_work = iwlagn_setup_deferred_work, | 373 | .setup_deferred_work = iwlagn_setup_deferred_work, |
375 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 374 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
376 | .send_tx_power = iwlagn_send_tx_power, | ||
377 | .update_chain_flags = iwl_update_chain_flags, | 375 | .update_chain_flags = iwl_update_chain_flags, |
378 | .set_channel_switch = iwl5000_hw_channel_switch, | 376 | .set_channel_switch = iwl5000_hw_channel_switch, |
379 | .apm_ops = { | 377 | .apm_ops = { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f8c710db6e6..eabf3b8495c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -281,7 +281,6 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
281 | .rx_handler_setup = iwlagn_rx_handler_setup, | 281 | .rx_handler_setup = iwlagn_rx_handler_setup, |
282 | .setup_deferred_work = iwlagn_setup_deferred_work, | 282 | .setup_deferred_work = iwlagn_setup_deferred_work, |
283 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 283 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
284 | .send_tx_power = iwlagn_send_tx_power, | ||
285 | .update_chain_flags = iwl_update_chain_flags, | 284 | .update_chain_flags = iwl_update_chain_flags, |
286 | .set_channel_switch = iwl6000_hw_channel_switch, | 285 | .set_channel_switch = iwl6000_hw_channel_switch, |
287 | .apm_ops = { | 286 | .apm_ops = { |
@@ -314,7 +313,6 @@ static struct iwl_lib_ops iwl6030_lib = { | |||
314 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, | 313 | .setup_deferred_work = iwlagn_bt_setup_deferred_work, |
315 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, | 314 | .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, |
316 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 315 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
317 | .send_tx_power = iwlagn_send_tx_power, | ||
318 | .update_chain_flags = iwl_update_chain_flags, | 316 | .update_chain_flags = iwl_update_chain_flags, |
319 | .set_channel_switch = iwl6000_hw_channel_switch, | 317 | .set_channel_switch = iwl6000_hw_channel_switch, |
320 | .apm_ops = { | 318 | .apm_ops = { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 4653deada05..52e941382e0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1131,9 +1131,6 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) | |||
1131 | if (priv->tx_power_user_lmt == tx_power && !force) | 1131 | if (priv->tx_power_user_lmt == tx_power && !force) |
1132 | return 0; | 1132 | return 0; |
1133 | 1133 | ||
1134 | if (!priv->cfg->ops->lib->send_tx_power) | ||
1135 | return -EOPNOTSUPP; | ||
1136 | |||
1137 | if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) { | 1134 | if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) { |
1138 | IWL_WARN(priv, | 1135 | IWL_WARN(priv, |
1139 | "Requested user TXPOWER %d below lower limit %d.\n", | 1136 | "Requested user TXPOWER %d below lower limit %d.\n", |
@@ -1167,7 +1164,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) | |||
1167 | prev_tx_power = priv->tx_power_user_lmt; | 1164 | prev_tx_power = priv->tx_power_user_lmt; |
1168 | priv->tx_power_user_lmt = tx_power; | 1165 | priv->tx_power_user_lmt = tx_power; |
1169 | 1166 | ||
1170 | ret = priv->cfg->ops->lib->send_tx_power(priv); | 1167 | ret = iwlagn_send_tx_power(priv); |
1171 | 1168 | ||
1172 | /* if fail to set tx_power, restore the orig. tx power */ | 1169 | /* if fail to set tx_power, restore the orig. tx power */ |
1173 | if (ret) { | 1170 | if (ret) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 3bb76f6ea41..a87b54fb9e7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -141,7 +141,6 @@ struct iwl_lib_ops { | |||
141 | struct iwl_apm_ops apm_ops; | 141 | struct iwl_apm_ops apm_ops; |
142 | 142 | ||
143 | /* power */ | 143 | /* power */ |
144 | int (*send_tx_power) (struct iwl_priv *priv); | ||
145 | void (*update_chain_flags)(struct iwl_priv *priv); | 144 | void (*update_chain_flags)(struct iwl_priv *priv); |
146 | 145 | ||
147 | /* eeprom operations (as defined in iwl-eeprom.h) */ | 146 | /* eeprom operations (as defined in iwl-eeprom.h) */ |