From f503c769534353e7eba5b5ff6b1b6cbce39efc2b Mon Sep 17 00:00:00 2001

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

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

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

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/3945-rs.c | 14 ++------------

 src/3945.h    |  3 ---

 2 files changed, 2 insertions(+), 15 deletions(-)

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

index a697edd46e7fcb41c6c52de33609e1247255aedb..1d810cae6091db9609e48604df55c7f0a59fb67a 100644

--- a/src/3945-rs.c

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

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

 };

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

index 00030d43a1947380cf818bae7ff11a31b26d92a8..1aeb4b238fcf3f4b91b147e40431fd3b0dba3a5d 100644

--- a/src/3945.h

+++ b/src/3945.h

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

-- 

2.31.1