From ffb92649f4d93a83de8977f8806cda64204cc465 Mon Sep 17 00:00:00 2001

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Date: Wed, 12 Jun 2019 16:26:55 +0200

Subject: [Backport ffb92649f4d9] 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.

Cc: Stanislaw Gruszka <sgruszka@redhat.com>

Cc: Kalle Valo <kvalo@codeaurora.org>

Cc: "David S. Miller" <davem@davemloft.net>

Cc: linux-wireless@vger.kernel.org

Cc: netdev@vger.kernel.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

---

 src/4965-rs.c | 31 +++++--------------

 src/common.h  |  4 ---

 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/4965-rs.c b/src/4965-rs.c

index 54ff83829afb11dcc8c56871bac3d1543e3fa33b..f640709d986233f25a852cbe32f28c8f6abcbe3c 100644

--- a/src/4965-rs.c

+++ b/src/4965-rs.c

@@ -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

 };

diff --git a/src/common.h b/src/common.h

index 986646af8dfd4da3e0da8c7bb023fe646ccc9930..3c6f41763dde17a24677e77e9808aeff21c350c3 100644

--- a/src/common.h

+++ b/src/common.h

@@ -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;

-- 

2.31.1