summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-01-08 21:19:45 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-02-02 14:37:34 -0800
commit99673ee556fce2fb973eaa571adb12663330caa9 (patch)
tree89666dd629df5549b246b36e8631a24a69ef2083 /drivers/net/wireless/iwlwifi/iwl-trans.h
parent9ca859615212deb7dd0aee26972799d1910d050f (diff)
downloadblackbird-op-linux-99673ee556fce2fb973eaa571adb12663330caa9.tar.gz
blackbird-op-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.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 593102d89c74..0359d71e554f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -234,6 +234,8 @@ struct iwl_calib_result {
* @reg_lock - protect hw register access
* @dev - pointer to struct device * that represents the device
* @irq - the irq number for the device
+ * @hw_id: a u32 with the ID of the device / subdevice.
+ * Set during transport alloaction.
* @hw_id_str: a string with info about HW ID. Set during transport allocation.
* @ucode_write_complete: indicates that the ucode has been copied.
* @ucode_rt: run time ucode image
@@ -251,6 +253,7 @@ struct iwl_trans {
struct device *dev;
unsigned int irq;
+ u32 hw_id;
char hw_id_str[52];
u8 ucode_write_complete; /* the image write is complete */
OpenPOWER on IntegriCloud