iwlegacy: 3945: no need to check return value of debugfs_create functions
Subsystems (5)
PATCH 1/5 iwlegacy: 3945: no need to check return value of debugfs_create functions
When calling debugfs functions, there is no need to ever check the return value. This driver was saving the debugfs file away to be removed at a later time. However, the 80211 core would delete the whole directory that the debugfs files are created in, after it asks the driver to do the deletion, so just rely on the 80211 core to do all of the cleanup for us, making us not need to keep a pointer to the dentries around at all.
This cleans up the structure of the driver data a bit and makes the code a tiny bit smaller.
--- drivers/net/wireless/intel/iwlegacy/3945-rs.c | 14 ++------------ drivers/net/wireless/intel/iwlegacy/3945.h | 3 --- 2 files changed, 2 insertions(+), 15 deletions(-)
drivers/net/wireless/intel/iwlegacy/3945-rs.c +2 -12
@@ -861,17 +861,8 @@ il3945_add_debugfs(void *il, void *il_sta, struct dentry *dir) {struct il3945_rs_sta *lq_sta = il_sta; - lq_sta->rs_sta_dbgfs_stats_table_file = -debugfs_create_file ("rate_stats_table" ,0600 , dir, lq_sta, - &rs_sta_dbgfs_stats_table_ops); - -} - -static void -il3945_remove_debugfs (void *il,void *il_sta) -{ -struct il3945_rs_sta *lq_sta = il_sta; -debugfs_remove (lq_sta->rs_sta_dbgfs_stats_table_file); +debugfs_create_file ("rate_stats_table" ,0600 , dir, lq_sta, + &rs_sta_dbgfs_stats_table_ops); }#endif
@@ -898,7 +889,6 @@ static const struct rate_control_ops rs_ops = { .free_sta = il3945_rs_free_sta, #ifdef CONFIG_MAC80211_DEBUGFS .add_sta_debugfs = il3945_add_debugfs, - .remove_sta_debugfs = il3945_remove_debugfs,#endif };
drivers/net/wireless/intel/iwlegacy/3945.h +0 -3
@@ -87,9 +87,6 @@ struct il3945_rs_sta {u8 start_rate;struct timer_list rate_scale_flush;struct il3945_rate_scale_data win[RATE_COUNT_3945 ]; -#ifdef CONFIG_MAC80211_DEBUGFS -struct dentry *rs_sta_dbgfs_stats_table_file; -#endif /* used to be in sta_info */ int last_txrate_idx;
Signature · 1 line
2.22.0
PATCH 2/5 iwlegacy: 4965: no need to check return value of debugfs_create functions
When calling debugfs functions, there is no need to ever check the return value. This driver was saving the debugfs file away to be removed at a later time. However, the 80211 core would delete the whole directory that the debugfs files are created in, after it asks the driver to do the deletion, so just rely on the 80211 core to do all of the cleanup for us, making us not need to keep a pointer to the dentries around at all.
This cleans up the structure of the driver data a bit and makes the code a tiny bit smaller.
--- drivers/net/wireless/intel/iwlegacy/4965-rs.c | 31 +++++-------------- drivers/net/wireless/intel/iwlegacy/common.h | 4 --- 2 files changed, 8 insertions(+), 27 deletions(-)
drivers/net/wireless/intel/iwlegacy/4965-rs.c +8 -23
@@ -2767,29 +2767,15 @@ static void il4965_rs_add_debugfs(void *il, void *il_sta, struct dentry *dir) {struct il_lq_sta *lq_sta = il_sta; - lq_sta->rs_sta_dbgfs_scale_table_file = -debugfs_create_file ("rate_scale_table" ,0600 , dir, - lq_sta, &rs_sta_dbgfs_scale_table_ops); - lq_sta->rs_sta_dbgfs_stats_table_file = -debugfs_create_file ("rate_stats_table" ,0400 , dir, lq_sta, - &rs_sta_dbgfs_stats_table_ops); - lq_sta->rs_sta_dbgfs_rate_scale_data_file = -debugfs_create_file ("rate_scale_data" ,0400 , dir, lq_sta, - &rs_sta_dbgfs_rate_scale_data_ops); - lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file = -debugfs_create_u8 ("tx_agg_tid_enable" ,0600 , dir, - &lq_sta->tx_agg_tid_en); -} - -static void -il4965_rs_remove_debugfs (void *il,void *il_sta) -{ -struct il_lq_sta *lq_sta = il_sta; -debugfs_remove (lq_sta->rs_sta_dbgfs_scale_table_file); -debugfs_remove (lq_sta->rs_sta_dbgfs_stats_table_file); -debugfs_remove (lq_sta->rs_sta_dbgfs_rate_scale_data_file); -debugfs_remove (lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file); +debugfs_create_file ("rate_scale_table" ,0600 , dir, lq_sta, + &rs_sta_dbgfs_scale_table_ops); +debugfs_create_file ("rate_stats_table" ,0400 , dir, lq_sta, + &rs_sta_dbgfs_stats_table_ops); +debugfs_create_file ("rate_scale_data" ,0400 , dir, lq_sta, + &rs_sta_dbgfs_rate_scale_data_ops); +debugfs_create_u8 ("tx_agg_tid_enable" ,0600 , dir, + &lq_sta->tx_agg_tid_en); }#endif
@@ -2816,7 +2802,6 @@ static const struct rate_control_ops rs_4965_ops = { .free_sta = il4965_rs_free_sta, #ifdef CONFIG_MAC80211_DEBUGFS .add_sta_debugfs = il4965_rs_add_debugfs, - .remove_sta_debugfs = il4965_rs_remove_debugfs,#endif };
drivers/net/wireless/intel/iwlegacy/common.h +0 -4
@@ -2822,10 +2822,6 @@ struct il_lq_sta {struct il_traffic_load load[TID_MAX_LOAD_COUNT ];u8 tx_agg_tid_en;#ifdef CONFIG_MAC80211_DEBUGFS -struct dentry *rs_sta_dbgfs_scale_table_file; -struct dentry *rs_sta_dbgfs_stats_table_file; -struct dentry *rs_sta_dbgfs_rate_scale_data_file; -struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;u32 dbg_fixed_rate;#endif struct il_priv *drv;
Signature · 1 line
2.22.0
PATCH 4/5 iwlwifi: mvm: remove unused .remove_sta_debugfs callback
In reply to Greg Kroah-HartmanThe .remove_sta_debugfs callback was not doing anything in this driver, so remove it as it is not needed.
--- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rs.c +0 -5
@@ -4108,10 +4108,6 @@ static void rs_drv_add_sta_debugfs(void *mvm, void *priv_sta, MVM_DEBUGFS_ADD_FILE_RS(ss_force, dir, 0600); } - -void rs_remove_sta_debugfs (void *mvm,void *mvm_sta) -{ -}#endif /*
@@ -4139,7 +4135,6 @@ static const struct rate_control_ops rs_mvm_ops_drv = { .rate_update = rs_drv_rate_update, #ifdef CONFIG_MAC80211_DEBUGFS .add_sta_debugfs = rs_drv_add_sta_debugfs, - .remove_sta_debugfs = rs_remove_sta_debugfs, #endif .capa = RATE_CTRL_CAPA_VHT_EXT_NSS_BW, };
Signature · 1 line
2.22.0
PATCH 5/5 mac80211: remove unused and unneeded remove_sta_debugfs callback
In reply to Greg Kroah-HartmanThe remove_sta_debugfs callback in struct rate_control_ops is no longer used by any driver, as there is no need for it (the debugfs directory is already removed recursivly by the mac80211 core.) Because no one needs it, just remove it to keep anyone else from accidentally using it in the future.
--- include/net/mac80211.h | 1 - net/mac80211/rate.h | 9 --------- net/mac80211/sta_info.c | 1 - 3 files changed, 11 deletions(-)
include/net/mac80211.h +0 -1
@@ -5939,7 +5939,6 @@ struct rate_control_ops {void (*add_sta_debugfs)(void *priv,void *priv_sta,struct dentry *dir); -void (*remove_sta_debugfs)(void *priv,void *priv_sta);u32 (*get_expected_throughput)(void *priv_sta); };
net/mac80211/rate.h +0 -9
@@ -63,15 +63,6 @@ static inline void rate_control_add_sta_debugfs(struct sta_info *sta)#endif } -static inline void rate_control_remove_sta_debugfs (struct sta_info *sta) -{ -#ifdef CONFIG_MAC80211_DEBUGFS -struct rate_control_ref *ref = sta->rate_ctrl; -if (ref && ref->ops->remove_sta_debugfs) - ref->ops->remove_sta_debugfs (ref->priv, sta->rate_ctrl_priv); -#endif -} -void ieee80211_check_rate_mask (struct ieee80211_sub_if_data *sdata);/* Get a reference to the rate control algorithm. If `name' is NULL, get the
net/mac80211/sta_info.c +0 -1
@@ -1027,7 +1027,6 @@ static void __sta_info_destroy_part2(struct sta_info *sta)cfg80211_del_sta_sinfo (sdata->dev, sta->sta.addr, sinfo,GFP_KERNEL );kfree (sinfo); -rate_control_remove_sta_debugfs (sta);ieee80211_sta_debugfs_remove (sta);cleanup_single_sta (sta);
Signature · 1 line
2.22.0
PATCH 3/5 iwlwifi: dvm: no need to check return value of debugfs_create functions
In reply to Greg Kroah-HartmanWhen calling debugfs functions, there is no need to ever check the return value. This driver was saving the debugfs file away to be removed at a later time. However, the 80211 core would delete the whole directory that the debugfs files are created in, after it asks the driver to do the deletion, so just rely on the 80211 core to do all of the cleanup for us, making us not need to keep a pointer to the dentries around at all.
This cleans up the structure of the driver data a bit and makes the code a tiny bit smaller.
--- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 29 ++++++--------------- drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 4 --- 2 files changed, 8 insertions(+), 25 deletions(-)
drivers/net/wireless/intel/iwlwifi/dvm/rs.c +8 -21
@@ -3271,28 +3271,16 @@ static void rs_add_debugfs(void *priv, void *priv_sta, struct dentry *dir) {struct iwl_lq_sta *lq_sta = priv_sta; - lq_sta->rs_sta_dbgfs_scale_table_file = -debugfs_create_file ("rate_scale_table" ,0600 , dir, - lq_sta, &rs_sta_dbgfs_scale_table_ops); - lq_sta->rs_sta_dbgfs_stats_table_file = -debugfs_create_file ("rate_stats_table" ,0400 , dir, - lq_sta, &rs_sta_dbgfs_stats_table_ops); - lq_sta->rs_sta_dbgfs_rate_scale_data_file = -debugfs_create_file ("rate_scale_data" ,0400 , dir, - lq_sta, &rs_sta_dbgfs_rate_scale_data_ops); - lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file = -debugfs_create_u8 ("tx_agg_tid_enable" ,0600 , dir, - &lq_sta->tx_agg_tid_en); -} +debugfs_create_file ("rate_scale_table" ,0600 , dir, lq_sta, + &rs_sta_dbgfs_scale_table_ops); +debugfs_create_file ("rate_stats_table" ,0400 , dir, lq_sta, + &rs_sta_dbgfs_stats_table_ops); +debugfs_create_file ("rate_scale_data" ,0400 , dir, lq_sta, + &rs_sta_dbgfs_rate_scale_data_ops); +debugfs_create_u8 ("tx_agg_tid_enable" ,0600 , dir, + &lq_sta->tx_agg_tid_en); -static void rs_remove_debugfs (void *priv,void *priv_sta) -{ -struct iwl_lq_sta *lq_sta = priv_sta; -debugfs_remove (lq_sta->rs_sta_dbgfs_scale_table_file); -debugfs_remove (lq_sta->rs_sta_dbgfs_stats_table_file); -debugfs_remove (lq_sta->rs_sta_dbgfs_rate_scale_data_file); -debugfs_remove (lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file); }#endif
@@ -3318,7 +3306,6 @@ static const struct rate_control_ops rs_ops = { .free_sta = rs_free_sta, #ifdef CONFIG_MAC80211_DEBUGFS .add_sta_debugfs = rs_add_debugfs, - .remove_sta_debugfs = rs_remove_debugfs,#endif };
drivers/net/wireless/intel/iwlwifi/dvm/rs.h +0 -4
@@ -367,10 +367,6 @@ struct iwl_lq_sta {struct iwl_traffic_load load[IWL_MAX_TID_COUNT ];u8 tx_agg_tid_en;#ifdef CONFIG_MAC80211_DEBUGFS -struct dentry *rs_sta_dbgfs_scale_table_file; -struct dentry *rs_sta_dbgfs_stats_table_file; -struct dentry *rs_sta_dbgfs_rate_scale_data_file; -struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;u32 dbg_fixed_rate;#endif struct iwl_priv *drv;
Signature · 1 line
2.22.0
Quoted 11 lines · Greg Kroah-Hartman
When calling debugfs functions, there is no need to ever check the return value. This driver was saving the debugfs file away to be removed at a later time. However, the 80211 core would delete the whole directory that the debugfs files are created in, after it asks the driver to do the deletion, so just rely on the 80211 core to do all of the cleanup for us, making us not need to keep a pointer to the dentries around at all.
This cleans up the structure of the driver data a bit and makes the code a tiny bit smaller.
Quoted 6 lines
Cc Stanislaw Gruszka <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
2 patches applied to wireless-drivers-next.git, thanks.
f503c7695343 iwlegacy: 3945: no need to check return value of debugfs_create functions ffb92649f4d9 iwlegacy: 4965: no need to check return value of debugfs_create functions
Signature · 3 lines
https://patchwork.kernel.org/patch/10990125/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 3/5] iwlwifi: dvm: no need to check return value of debugfs_create functions
In reply to Greg Kroah-HartmanQuoted 20 lines · Greg Kroah-Hartman
When calling debugfs functions, there is no need to ever check the return value. This driver was saving the debugfs file away to be removed at a later time. However, the 80211 core would delete the whole directory that the debugfs files are created in, after it asks the driver to do the deletion, so just rely on the 80211 core to do all of the cleanup for us, making us not need to keep a pointer to the dentries around at all.
This cleans up the structure of the driver data a bit and makes the code a tiny bit smaller.
Cc Johannes Berg <[email protected]>Cc Emmanuel Grumbach <[email protected]>Cc Luca Coelho <[email protected]>Cc Intel Linux Wireless <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 1 line
---
Thanks, Greg! I applied this to our internal tree and it will reach the mainline following our normal upstreaming process.
--
Cheers,
Luca.
Re: [PATCH 4/5] iwlwifi: mvm: remove unused .remove_sta_debugfs callback
In reply to Greg Kroah-HartmanQuoted 16 lines · Greg Kroah-Hartman
The .remove_sta_debugfs callback was not doing anything in this driver, so remove it as it is not needed.
Cc Johannes Berg <[email protected]>Cc Emmanuel Grumbach <[email protected]>Cc Luca Coelho <[email protected]>Cc Intel Linux Wireless <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Sara Sharon <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Erel Geron <[email protected]>Cc Avraham Stern <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 1 line
---
Thanks, Greg! I applied this to our internal tree and it will reach the mainline following our normal upstreaming process.
--
Cheers,
Luca.