iwlwifi: remove priv from shared

Finally nothing needs to access priv
from shared any more, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 98f32e57f7f01f424b1851c9e593899ef658d85d..4cd375c811e2273ac010a19ed984c72f505c76df 100644 (file)
--- 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 26894dbadef2e1ef7f1111c3bb3d1cf79d748615..f8bef163dea359b149886923e9bdd7a9b727f7e7 100644 (file)
--- 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)