aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans-pcie.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-trans-pcie.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-trans-pcie.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-pcie.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index b6522ca2d879..3eab7d52f8ba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1549,7 +1549,7 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans,
1549 trans_pcie->command_names = trans_cfg->command_names; 1549 trans_pcie->command_names = trans_cfg->command_names;
1550} 1550}
1551 1551
1552static void iwl_trans_pcie_free(struct iwl_trans *trans) 1552void iwl_trans_pcie_free(struct iwl_trans *trans)
1553{ 1553{
1554 struct iwl_trans_pcie *trans_pcie = 1554 struct iwl_trans_pcie *trans_pcie =
1555 IWL_TRANS_GET_PCIE_TRANS(trans); 1555 IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -2044,7 +2044,7 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
2044 2044
2045#endif /*CONFIG_IWLWIFI_DEBUGFS */ 2045#endif /*CONFIG_IWLWIFI_DEBUGFS */
2046 2046
2047const struct iwl_trans_ops trans_ops_pcie = { 2047static const struct iwl_trans_ops trans_ops_pcie = {
2048 .start_hw = iwl_trans_pcie_start_hw, 2048 .start_hw = iwl_trans_pcie_start_hw,
2049 .stop_hw = iwl_trans_pcie_stop_hw, 2049 .stop_hw = iwl_trans_pcie_stop_hw,
2050 .fw_alive = iwl_trans_pcie_fw_alive, 2050 .fw_alive = iwl_trans_pcie_fw_alive,
@@ -2061,8 +2061,6 @@ const struct iwl_trans_ops trans_ops_pcie = {
2061 .tx_agg_disable = iwl_trans_pcie_tx_agg_disable, 2061 .tx_agg_disable = iwl_trans_pcie_tx_agg_disable,
2062 .tx_agg_setup = iwl_trans_pcie_tx_agg_setup, 2062 .tx_agg_setup = iwl_trans_pcie_tx_agg_setup,
2063 2063
2064 .free = iwl_trans_pcie_free,
2065
2066 .dbgfs_register = iwl_trans_pcie_dbgfs_register, 2064 .dbgfs_register = iwl_trans_pcie_dbgfs_register,
2067 2065
2068 .wait_tx_queue_empty = iwl_trans_pcie_wait_tx_queue_empty, 2066 .wait_tx_queue_empty = iwl_trans_pcie_wait_tx_queue_empty,