diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-03-26 12:03:18 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-18 10:31:23 -0400 |
commit | 87ce05a251227c0b607c6395f24ace96fc592806 (patch) | |
tree | ab9e5437a83d63fecf46bd25476ce6ef56407b61 /drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |
parent | 4b9844f5d887e31c18b9aad862b7ef5fde016d9b (diff) |
iwlwifi: remove the shared area
It is not needed any more.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 76f05ea1ad38..72ee1e6fcb9f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
@@ -1567,7 +1567,6 @@ static void iwl_trans_pcie_free(struct iwl_trans *trans) | |||
1567 | pci_release_regions(trans_pcie->pci_dev); | 1567 | pci_release_regions(trans_pcie->pci_dev); |
1568 | pci_disable_device(trans_pcie->pci_dev); | 1568 | pci_disable_device(trans_pcie->pci_dev); |
1569 | 1569 | ||
1570 | trans->shrd->trans = NULL; | ||
1571 | kfree(trans); | 1570 | kfree(trans); |
1572 | } | 1571 | } |
1573 | 1572 | ||
@@ -2083,8 +2082,7 @@ const struct iwl_trans_ops trans_ops_pcie = { | |||
2083 | .set_pmi = iwl_trans_pcie_set_pmi, | 2082 | .set_pmi = iwl_trans_pcie_set_pmi, |
2084 | }; | 2083 | }; |
2085 | 2084 | ||
2086 | struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd, | 2085 | struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, |
2087 | struct pci_dev *pdev, | ||
2088 | const struct pci_device_id *ent, | 2086 | const struct pci_device_id *ent, |
2089 | const struct iwl_cfg *cfg) | 2087 | const struct iwl_cfg *cfg) |
2090 | { | 2088 | { |
@@ -2102,7 +2100,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd, | |||
2102 | trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); | 2100 | trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); |
2103 | 2101 | ||
2104 | trans->ops = &trans_ops_pcie; | 2102 | trans->ops = &trans_ops_pcie; |
2105 | trans->shrd = shrd; | ||
2106 | trans->cfg = cfg; | 2103 | trans->cfg = cfg; |
2107 | trans_pcie->trans = trans; | 2104 | trans_pcie->trans = trans; |
2108 | spin_lock_init(&trans_pcie->irq_lock); | 2105 | spin_lock_init(&trans_pcie->irq_lock); |