leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: drv object can release its own memory

Browse Source 
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>
This commit is contained in:
Emmanuel Grumbach 2012-02-07 14:27:31 +02:00 committed by Wey-Yi Guy
parent 5c58edc63e
commit 07590f080d
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/iwlwifi/iwl-drv.c
View File

@ -92,3 +92,10 @@ int iwl_drv_start(struct iwl_shared *shrd,
return ret; return ret;
} }
void iwl_drv_stop(struct iwl_shared *shrd)
{
iwl_remove(shrd->priv);
kfree(shrd->nic);
}

13
drivers/net/wireless/iwlwifi/iwl-drv.h
View File

@ -107,4 +107,17 @@
int iwl_drv_start(struct iwl_shared *shrd, int iwl_drv_start(struct iwl_shared *shrd,
struct iwl_trans *trans, struct iwl_cfg *cfg); 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__ */ #endif /* __iwl_drv_h__ */

3
drivers/net/wireless/iwlwifi/iwl-pci.c
View File

@ -321,12 +321,11 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
struct iwl_bus *bus = pci_get_drvdata(pdev); struct iwl_bus *bus = pci_get_drvdata(pdev);
struct iwl_shared *shrd = bus->shrd; struct iwl_shared *shrd = bus->shrd;
iwl_remove(shrd->priv); iwl_drv_stop(shrd);
iwl_trans_free(shrd->trans); iwl_trans_free(shrd->trans);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
kfree(bus->shrd->nic);
kfree(bus->shrd); kfree(bus->shrd);
kfree(bus); kfree(bus);
} }