iwlwifi: mvm: don't use void pointers in debugfs

There's really no reason to use void *dbgfs_data
rather than a struct iwl_mvm *mvm, so do that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
index a90dde0f8d6c5d3d756fc53c181423ce47b59d1a..67f6a207165315d709cda315c9205de286c88789 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
@@ -69,7 +69,7 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,
 {
        struct ieee80211_vif *vif = file->private_data;
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-       struct iwl_mvm *mvm = mvmvif->dbgfs_data;
+       struct iwl_mvm *mvm = mvmvif->mvm;
        u8 ap_sta_id;
        struct ieee80211_chanctx_conf *chanctx_conf;
        char buf[512];
@@ -144,7 +144,7 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                return;
 
        mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
-       mvmvif->dbgfs_data = mvm;
+       mvmvif->mvm = mvm;
 
        if (!mvmvif->dbgfs_dir) {
                IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",

diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index c002b45e03c95726f9f8bd7f2701b37e9388339d..e7c97ccec5e8ea076e159073bdd1b152a1ce6db6 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -323,9 +323,9 @@ struct iwl_mvm_vif {
 #endif
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
+       struct iwl_mvm *mvm;
        struct dentry *dbgfs_dir;
        struct dentry *dbgfs_slink;
-       void *dbgfs_data;
        struct iwl_dbgfs_pm dbgfs_pm;
        struct iwl_dbgfs_bf dbgfs_bf;
 #endif