diff options
author | Helmut Schaa <helmut.schaa@googlemail.com> | 2008-12-01 10:53:28 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-05 09:35:46 -0500 |
commit | c58f9f635afe688c5c5709f441af57c12c7a4856 (patch) | |
tree | 0648fef4ff5ac03b521c1a90a451b6a058d934df /drivers | |
parent | 8e7be8da8ec7cc2828f4434d8d3c2ab4d1d4e7a4 (diff) |
iwl3945: remove obsolete irq handling
3945 hardware does not emit the interrupts CSR_INT_BIT_RF_KILL (rfkill
toggled) and CSR_INT_BIT_CT_KILL (adapter too hot). Hence this part of code
can be removed since iwl3945_irq_tasklet does not handle 4965 hw at all.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 69fda64c6503..94ea4c236838 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -4311,35 +4311,6 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv) | |||
4311 | /* Safely ignore these bits for debug checks below */ | 4311 | /* Safely ignore these bits for debug checks below */ |
4312 | inta &= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE); | 4312 | inta &= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE); |
4313 | 4313 | ||
4314 | /* HW RF KILL switch toggled (4965 only) */ | ||
4315 | if (inta & CSR_INT_BIT_RF_KILL) { | ||
4316 | int hw_rf_kill = 0; | ||
4317 | if (!(iwl3945_read32(priv, CSR_GP_CNTRL) & | ||
4318 | CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)) | ||
4319 | hw_rf_kill = 1; | ||
4320 | |||
4321 | IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL | IWL_DL_ISR, | ||
4322 | "RF_KILL bit toggled to %s.\n", | ||
4323 | hw_rf_kill ? "disable radio" : "enable radio"); | ||
4324 | |||
4325 | /* Queue restart only if RF_KILL switch was set to "kill" | ||
4326 | * when we loaded driver, and is now set to "enable". | ||
4327 | * After we're Alive, RF_KILL gets handled by | ||
4328 | * iwl3945_rx_card_state_notif() */ | ||
4329 | if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) { | ||
4330 | clear_bit(STATUS_RF_KILL_HW, &priv->status); | ||
4331 | queue_work(priv->workqueue, &priv->restart); | ||
4332 | } | ||
4333 | |||
4334 | handled |= CSR_INT_BIT_RF_KILL; | ||
4335 | } | ||
4336 | |||
4337 | /* Chip got too hot and stopped itself (4965 only) */ | ||
4338 | if (inta & CSR_INT_BIT_CT_KILL) { | ||
4339 | IWL_ERROR("Microcode CT kill error detected.\n"); | ||
4340 | handled |= CSR_INT_BIT_CT_KILL; | ||
4341 | } | ||
4342 | |||
4343 | /* Error detected by uCode */ | 4314 | /* Error detected by uCode */ |
4344 | if (inta & CSR_INT_BIT_SW_ERR) { | 4315 | if (inta & CSR_INT_BIT_SW_ERR) { |
4345 | IWL_ERROR("Microcode SW error detected. Restarting 0x%X.\n", | 4316 | IWL_ERROR("Microcode SW error detected. Restarting 0x%X.\n", |