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

Commit f5bde5b8 authored Aug 13, 2013 by Felix Fietkau Committed by John W. Linville Aug 15, 2013

ath9k: remove ath9k_sta_remove_debugfs



mac80211 uses debugfs_remove_recursive, so there's no need for the
driver to do an explicit cleanup of its sta debugfs entry.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 50676b81

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -262,10 +262,6 @@ struct ath_node {

	bool sleeping;		bool sleeping;
	bool no_ps_filter;		bool no_ps_filter;

	#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_ATH9K_DEBUGFS)
	struct dentry *node_stat;
	#endif
	};		};

	struct ath_tx_control {		struct ath_tx_control {

drivers/net/wireless/ath/ath9k/debug.c

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -1725,17 +1725,7 @@ void ath9k_sta_add_debugfs(struct ieee80211_hw *hw,
	struct dentry *dir)		struct dentry *dir)
	{		{
	struct ath_node an = (struct ath_node )sta->drv_priv;		struct ath_node an = (struct ath_node )sta->drv_priv;
	an->node_stat = debugfs_create_file("node_stat", S_IRUGO,		debugfs_create_file("node_stat", S_IRUGO, dir, an, &fops_node_stat);
	dir, an, &fops_node_stat);
	}

	void ath9k_sta_remove_debugfs(struct ieee80211_hw *hw,
	struct ieee80211_vif *vif,
	struct ieee80211_sta *sta,
	struct dentry *dir)
	{
	struct ath_node an = (struct ath_node )sta->drv_priv;
	debugfs_remove(an->node_stat);
	}		}

	/* Ethtool support for get-stats */		/* Ethtool support for get-stats */

drivers/net/wireless/ath/ath9k/debug.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -292,10 +292,6 @@ void ath9k_sta_add_debugfs(struct ieee80211_hw *hw,
	struct ieee80211_vif *vif,		struct ieee80211_vif *vif,
	struct ieee80211_sta *sta,		struct ieee80211_sta *sta,
	struct dentry *dir);		struct dentry *dir);
	void ath9k_sta_remove_debugfs(struct ieee80211_hw *hw,
	struct ieee80211_vif *vif,
	struct ieee80211_sta *sta,
	struct dentry *dir);
	void ath_debug_send_fft_sample(struct ath_softc *sc,		void ath_debug_send_fft_sample(struct ath_softc *sc,
	struct fft_sample_tlv *fft_sample);		struct fft_sample_tlv *fft_sample);
	void ath9k_debug_stat_ant(struct ath_softc *sc,		void ath9k_debug_stat_ant(struct ath_softc *sc,

drivers/net/wireless/ath/ath9k/main.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2364,7 +2364,6 @@ struct ieee80211_ops ath9k_ops = {

	#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_ATH9K_DEBUGFS)		#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_ATH9K_DEBUGFS)
	.sta_add_debugfs = ath9k_sta_add_debugfs,		.sta_add_debugfs = ath9k_sta_add_debugfs,
	.sta_remove_debugfs = ath9k_sta_remove_debugfs,
	#endif		#endif
	.sw_scan_start = ath9k_sw_scan_start,		.sw_scan_start = ath9k_sw_scan_start,
	.sw_scan_complete = ath9k_sw_scan_complete,		.sw_scan_complete = ath9k_sw_scan_complete,