aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-09-22 12:02:10 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-10-07 18:52:34 -0400
commit14e8e4afeb7e90f1f2d3f2d3b54da57c27f59f38 (patch)
tree10ffce32b86fbbd429cbee4a83c81fc3ae0c64de /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent9597ebac91e5a88f558d236a51d776508d42a237 (diff)
iwlwifi: remove apm_ops.stop
Since all devices share the same operation here, there's no need to call it indirectly. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c06b2189e09e..980c6096620a 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2637,7 +2637,7 @@ static void __iwl3945_down(struct iwl_priv *priv)
2637 udelay(5); 2637 udelay(5);
2638 2638
2639 /* Stop the device, and put it in low power state */ 2639 /* Stop the device, and put it in low power state */
2640 priv->cfg->ops->lib->apm_ops.stop(priv); 2640 iwl_apm_stop(priv);
2641 2641
2642 exit: 2642 exit:
2643 memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); 2643 memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
@@ -4212,7 +4212,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
4212 * paths to avoid running iwl_down() at all before leaving driver. 4212 * paths to avoid running iwl_down() at all before leaving driver.
4213 * This (inexpensive) call *makes sure* device is reset. 4213 * This (inexpensive) call *makes sure* device is reset.
4214 */ 4214 */
4215 priv->cfg->ops->lib->apm_ops.stop(priv); 4215 iwl_apm_stop(priv);
4216 4216
4217 /* make sure we flush any pending irq or 4217 /* make sure we flush any pending irq or
4218 * tasklet for the driver 4218 * tasklet for the driver