diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-02-07 13:27:31 +0100 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-27 22:25:38 +0100 |
| commit | 07590f080d5f29e33158b22f7ad6079b85d87609 (patch) | |
| tree | 84869bef3498fbe6b46788cc6d5035cb6ea2d5e5 /drivers/net/wireless | |
| parent | iwlwifi: introducing the drv object's flows (diff) | |
| download | linux-07590f080d5f29e33158b22f7ad6079b85d87609.tar.xz linux-07590f080d5f29e33158b22f7ad6079b85d87609.zip | |
iwlwifi: drv object can release its own memory
Move that code to the iwl-drv.c
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.h | 13 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 49f7e70bc362..b3876dec52af 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -92,3 +92,10 @@ int iwl_drv_start(struct iwl_shared *shrd, return ret; } +void iwl_drv_stop(struct iwl_shared *shrd) +{ + iwl_remove(shrd->priv); + + kfree(shrd->nic); +} + diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h index c40545199224..90534a23ddc8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.h +++ b/drivers/net/wireless/iwlwifi/iwl-drv.h @@ -107,4 +107,17 @@ int iwl_drv_start(struct iwl_shared *shrd, struct iwl_trans *trans, struct iwl_cfg *cfg); +/** + * iwl_drv_stop - stop the drv + * + * @shrd: the shrd area + * + * TODO: review the parameters given to this function + * + * Stop the driver. This should be called by bus specific system flows + * implementations. For example, the bus specific remove function should first + * call this function and then do the bus related operations only. + */ +void iwl_drv_stop(struct iwl_shared *shrd); + #endif /* __iwl_drv_h__ */ diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index e2695445dfac..b9cdd1ac1744 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c @@ -321,12 +321,11 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) struct iwl_bus *bus = pci_get_drvdata(pdev); struct iwl_shared *shrd = bus->shrd; - iwl_remove(shrd->priv); + iwl_drv_stop(shrd); iwl_trans_free(shrd->trans); pci_set_drvdata(pdev, NULL); - kfree(bus->shrd->nic); kfree(bus->shrd); kfree(bus); } |