Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49175fe6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Johannes Berg
Browse files

iwlwifi: dvm: 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.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20190612142658.12792-3-gregkh@linuxfoundation.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5db4c4b9

drivers/net/wireless/intel/iwlwifi/dvm/rs.c

+8 −21
Original line number Diff line number Diff line
@@ -3256,29 +3256,17 @@ 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_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



/*
@@ -3303,7 +3291,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
Original line number Diff line number Diff line
@@ -356,10 +356,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;