diff options
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h index ec17e2e84151..7dd11891ccfe 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h +++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h @@ -1078,9 +1078,9 @@ void __releases(nic_access_nobh) iwl_trans_pcie_release_nic_access(struct iwl_trans *trans); void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power); int iwl_pci_gen1_2_probe(struct pci_dev *pdev, - const struct pci_device_id *ent, - const struct iwl_mac_cfg *trans, u8 __iomem *hw_base, - u32 hw_rev); + const struct pci_device_id *ent, + const struct iwl_mac_cfg *mac_cfg, + u8 __iomem *hw_base, u32 hw_rev); /* transport gen 1 exported functions */ void iwl_trans_pcie_fw_alive(struct iwl_trans *trans); diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c index 8440f0c8a78e..585d845b53fa 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c @@ -4130,8 +4130,8 @@ static void iwl_pcie_check_me_status(struct iwl_trans *trans) int iwl_pci_gen1_2_probe(struct pci_dev *pdev, const struct pci_device_id *ent, - const struct iwl_mac_cfg *trans, u8 __iomem *hw_base, - u32 hw_rev) + const struct iwl_mac_cfg *mac_cfg, + u8 __iomem *hw_base, u32 hw_rev) { const struct iwl_dev_info *dev_info; struct iwl_trans_info info = { @@ -4142,7 +4142,7 @@ int iwl_pci_gen1_2_probe(struct pci_dev *pdev, struct iwl_trans_pcie *trans_pcie; int ret; - iwl_trans = iwl_trans_pcie_alloc(pdev, trans, &info, hw_base); + iwl_trans = iwl_trans_pcie_alloc(pdev, mac_cfg, &info, hw_base); if (IS_ERR(iwl_trans)) return PTR_ERR(iwl_trans); |