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-drv.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-drv.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 1221a8c15a1f..1219c0de5730 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c | |||
@@ -77,7 +77,6 @@ | |||
77 | /** | 77 | /** |
78 | * struct iwl_drv - drv common data | 78 | * struct iwl_drv - drv common data |
79 | * @fw: the iwl_fw structure | 79 | * @fw: the iwl_fw structure |
80 | * @shrd: pointer to common shared structure | ||
81 | * @op_mode: the running op_mode | 80 | * @op_mode: the running op_mode |
82 | * @trans: transport layer | 81 | * @trans: transport layer |
83 | * @dev: for debug prints only | 82 | * @dev: for debug prints only |
@@ -89,7 +88,6 @@ | |||
89 | struct iwl_drv { | 88 | struct iwl_drv { |
90 | struct iwl_fw fw; | 89 | struct iwl_fw fw; |
91 | 90 | ||
92 | struct iwl_shared *shrd; | ||
93 | struct iwl_op_mode *op_mode; | 91 | struct iwl_op_mode *op_mode; |
94 | struct iwl_trans *trans; | 92 | struct iwl_trans *trans; |
95 | struct device *dev; | 93 | struct device *dev; |
@@ -885,8 +883,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) | |||
885 | device_release_driver(drv->trans->dev); | 883 | device_release_driver(drv->trans->dev); |
886 | } | 884 | } |
887 | 885 | ||
888 | struct iwl_drv *iwl_drv_start(struct iwl_shared *shrd, | 886 | struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, |
889 | struct iwl_trans *trans, | ||
890 | const struct iwl_cfg *cfg) | 887 | const struct iwl_cfg *cfg) |
891 | { | 888 | { |
892 | struct iwl_drv *drv; | 889 | struct iwl_drv *drv; |
@@ -897,8 +894,6 @@ struct iwl_drv *iwl_drv_start(struct iwl_shared *shrd, | |||
897 | dev_printk(KERN_ERR, trans->dev, "Couldn't allocate iwl_drv"); | 894 | dev_printk(KERN_ERR, trans->dev, "Couldn't allocate iwl_drv"); |
898 | return NULL; | 895 | return NULL; |
899 | } | 896 | } |
900 | /* For printing only - temporary until we change the logger */ | ||
901 | drv->shrd = shrd; | ||
902 | drv->trans = trans; | 897 | drv->trans = trans; |
903 | drv->dev = trans->dev; | 898 | drv->dev = trans->dev; |
904 | drv->cfg = cfg; | 899 | drv->cfg = cfg; |