diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-04-12 06:24:30 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-23 14:30:29 -0700 |
| commit | d1ff52536a0d1bd516a628ef43dfaf6fe9c90fe2 (patch) | |
| tree | bb50fc848b14272b472e9db65b2a793e93069914 /drivers/net/wireless/iwlwifi/iwl-pci.c | |
| parent | 0db19cde17ece4695cec503f9f6f0a1d4621dac7 (diff) | |
| download | lwn-d1ff52536a0d1bd516a628ef43dfaf6fe9c90fe2.tar.gz lwn-d1ff52536a0d1bd516a628ef43dfaf6fe9c90fe2.zip | |
iwlwifi: use direct calls for transport free
Since the transport allocates and frees itself in
the transport specific code, there's no need for
virtual functions for it. Remove the free method
and call the correct functions directly.
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/iwl-pci.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 49d2b1886f2f..e80e9aa80883 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c @@ -285,7 +285,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; out_free_trans: - iwl_trans_free(iwl_trans); + iwl_trans_pcie_free(iwl_trans); pci_set_drvdata(pdev, NULL); return -EFAULT; } @@ -296,7 +296,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); iwl_drv_stop(trans_pcie->drv); - iwl_trans_free(trans); + iwl_trans_pcie_free(trans); pci_set_drvdata(pdev, NULL); } |