diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-11-12 11:16:38 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-12-09 15:29:03 -0500 |
commit | 7f09d70436729dee9dfa7ab11fda9d384c4bdf9f (patch) | |
tree | f1c5b1e0f625638464327837c236f46036f0de12 | |
parent | 820a1a50025550061b0d0ea15a760ecd183886f7 (diff) |
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>
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c index a90dde0f8d6c..67f6a2071653 100644 --- 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, | |||
69 | { | 69 | { |
70 | struct ieee80211_vif *vif = file->private_data; | 70 | struct ieee80211_vif *vif = file->private_data; |
71 | struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); | 71 | struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); |
72 | struct iwl_mvm *mvm = mvmvif->dbgfs_data; | 72 | struct iwl_mvm *mvm = mvmvif->mvm; |
73 | u8 ap_sta_id; | 73 | u8 ap_sta_id; |
74 | struct ieee80211_chanctx_conf *chanctx_conf; | 74 | struct ieee80211_chanctx_conf *chanctx_conf; |
75 | char buf[512]; | 75 | char buf[512]; |
@@ -144,7 +144,7 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif) | |||
144 | return; | 144 | return; |
145 | 145 | ||
146 | mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir); | 146 | mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir); |
147 | mvmvif->dbgfs_data = mvm; | 147 | mvmvif->mvm = mvm; |
148 | 148 | ||
149 | if (!mvmvif->dbgfs_dir) { | 149 | if (!mvmvif->dbgfs_dir) { |
150 | IWL_ERR(mvm, "Failed to create debugfs directory under %s\n", | 150 | 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 c002b45e03c9..e7c97ccec5e8 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h | |||
@@ -323,9 +323,9 @@ struct iwl_mvm_vif { | |||
323 | #endif | 323 | #endif |
324 | 324 | ||
325 | #ifdef CONFIG_IWLWIFI_DEBUGFS | 325 | #ifdef CONFIG_IWLWIFI_DEBUGFS |
326 | struct iwl_mvm *mvm; | ||
326 | struct dentry *dbgfs_dir; | 327 | struct dentry *dbgfs_dir; |
327 | struct dentry *dbgfs_slink; | 328 | struct dentry *dbgfs_slink; |
328 | void *dbgfs_data; | ||
329 | struct iwl_dbgfs_pm dbgfs_pm; | 329 | struct iwl_dbgfs_pm dbgfs_pm; |
330 | struct iwl_dbgfs_bf dbgfs_bf; | 330 | struct iwl_dbgfs_bf dbgfs_bf; |
331 | #endif | 331 | #endif |