From: Johannes Berg Date: Tue, 6 Mar 2012 21:31:04 +0000 (-0800) Subject: iwlwifi: remove priv from shared X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef0ef9c8de7e7a069bc2c80a8687c4ab9fa9aff2;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git iwlwifi: remove priv from shared Finally nothing needs to access priv from shared any more, so remove it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 98f32e57f7f0..4cd375c811e2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1205,7 +1205,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, op_mode->ops = &iwl_dvm_ops; priv = IWL_OP_MODE_GET_DVM(op_mode); priv->shrd = trans->shrd; - priv->shrd->priv = priv; priv->fw = fw; /* TODO: remove fw from shared data later */ priv->shrd->fw = fw; diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 26894dbadef2..f8bef163dea3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -378,7 +378,6 @@ struct iwl_shared { u8 valid_contexts; const struct iwl_cfg *cfg; - struct iwl_priv *priv; struct iwl_trans *trans; void *drv; struct iwl_hw_params hw_params; @@ -400,7 +399,6 @@ struct iwl_shared { }; /*Whatever _m is (iwl_trans, iwl_priv, these macros will work */ -#define priv(_m) ((_m)->shrd->priv) #define cfg(_m) ((_m)->shrd->cfg) #define trans(_m) ((_m)->shrd->trans) #define hw_params(_m) ((_m)->shrd->hw_params)