Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07590f08 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: drv object can release its own memory 



Move that code to the iwl-drv.c

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 5c58edc6

drivers/net/wireless/iwlwifi/iwl-drv.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/wireless/iwlwifi/iwl-drv.h

+13 −0
Original line number Diff line number Diff line
@@ -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__ */

drivers/net/wireless/iwlwifi/iwl-pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}