aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-pci.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-04-12 09:24:30 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-04-23 17:30:29 -0400
commitd1ff52536a0d1bd516a628ef43dfaf6fe9c90fe2 (patch)
treebb50fc848b14272b472e9db65b2a793e93069914 /drivers/net/wireless/iwlwifi/iwl-pci.c
parent0db19cde17ece4695cec503f9f6f0a1d4621dac7 (diff)
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.c4
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)
285 return 0; 285 return 0;
286 286
287out_free_trans: 287out_free_trans:
288 iwl_trans_free(iwl_trans); 288 iwl_trans_pcie_free(iwl_trans);
289 pci_set_drvdata(pdev, NULL); 289 pci_set_drvdata(pdev, NULL);
290 return -EFAULT; 290 return -EFAULT;
291} 291}
@@ -296,7 +296,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
296 struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); 296 struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
297 297
298 iwl_drv_stop(trans_pcie->drv); 298 iwl_drv_stop(trans_pcie->drv);
299 iwl_trans_free(trans); 299 iwl_trans_pcie_free(trans);
300 300
301 pci_set_drvdata(pdev, NULL); 301 pci_set_drvdata(pdev, NULL);
302} 302}