diff options
| author | Emmanuel Grumbach | 2012-01-08 20:19:45 +0100 |
|---|---|---|
| committer | Wey-Yi Guy | 2012-02-02 23:37:34 +0100 |
| commit | 99673ee556fce2fb973eaa571adb12663330caa9 (patch) | |
| tree | 89666dd629df5549b246b36e8631a24a69ef2083 /drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |
| parent | iwlwifi: kill bus_get_hw_id_string (diff) | |
| download | kernel-qcow2-linux-99673ee556fce2fb973eaa571adb12663330caa9.tar.gz kernel-qcow2-linux-99673ee556fce2fb973eaa571adb12663330caa9.tar.xz kernel-qcow2-linux-99673ee556fce2fb973eaa571adb12663330caa9.zip | |
iwlwifi: kill bus_get_hw_id
Get this information from the transport layer.
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 73ff68ac7c45..4b711b790a90 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c @@ -2317,6 +2317,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd, trans->dev = &pdev->dev; trans->irq = pdev->irq; trans_pcie->pci_dev = pdev; + trans->hw_id = (pdev->device << 16) + pdev->subsystem_device; snprintf(trans->hw_id_str, sizeof(trans->hw_id_str), "PCI ID: 0x%04X:0x%04X", pdev->device, pdev->subsystem_device); |