Skip to content

Commit

Permalink
iwlwifi: drv object can release its own memory
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Emmanuel Grumbach authored and Wey-Yi Guy committed Feb 27, 2012
1 parent 5c58edc commit 07590f0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
7 changes: 7 additions & 0 deletions drivers/net/wireless/iwlwifi/iwl-drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

13 changes: 13 additions & 0 deletions drivers/net/wireless/iwlwifi/iwl-drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
3 changes: 1 addition & 2 deletions drivers/net/wireless/iwlwifi/iwl-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 07590f0

Please sign in to comment.