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

Commit c7e9dbcf authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove sta_remove_debugfs driver callback 



No drivers implement this, relying either on the recursive
directory removal to remove their debugfs, or not having any
to start with. Remove the dead driver callback.

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

include/net/mac80211.h

+2 −9
Original line number Original line Diff line number Diff line
@@ -3101,11 +3101,8 @@ enum ieee80211_reconfig_type { 
 *

 *

 * @sta_add_debugfs: Drivers can use this callback to add debugfs files

 * @sta_add_debugfs: Drivers can use this callback to add debugfs files

 *	when a station is added to mac80211's station list. This callback

 *	when a station is added to mac80211's station list. This callback

 *	and @sta_remove_debugfs should be within a CONFIG_MAC80211_DEBUGFS

 *	should be within a CONFIG_MAC80211_DEBUGFS conditional. This

 *	conditional. This callback can sleep.

 *	callback can sleep.

 *

 * @sta_remove_debugfs: Remove the debugfs files which were added using

 *	@sta_add_debugfs. This callback can sleep.

 *

 *

 * @sta_notify: Notifies low level driver about power state transition of an

 * @sta_notify: Notifies low level driver about power state transition of an

 *	associated station, AP,  IBSS/WDS/mesh peer etc. For a VIF operating

 *	associated station, AP,  IBSS/WDS/mesh peer etc. For a VIF operating
@@ -3501,10 +3498,6 @@ struct ieee80211_ops { 
				struct ieee80211_vif *vif,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta,

				struct ieee80211_sta *sta,

				struct dentry *dir);

				struct dentry *dir);

	void (*sta_remove_debugfs)(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   struct ieee80211_sta *sta,

				   struct dentry *dir);

#endif

#endif

	void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

	void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			enum sta_notify_cmd, struct ieee80211_sta *sta);

			enum sta_notify_cmd, struct ieee80211_sta *sta);

net/mac80211/debugfs_sta.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -544,10 +544,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) 




void ieee80211_sta_debugfs_remove(struct sta_info *sta)

void ieee80211_sta_debugfs_remove(struct sta_info *sta)

{

{

	struct ieee80211_local *local = sta->local;

	struct ieee80211_sub_if_data *sdata = sta->sdata;



	drv_sta_remove_debugfs(local, sdata, &sta->sta, sta->debugfs_dir);

	debugfs_remove_recursive(sta->debugfs_dir);

	debugfs_remove_recursive(sta->debugfs_dir);

	sta->debugfs_dir = NULL;

	sta->debugfs_dir = NULL;

}
 
}

net/mac80211/driver-ops.h

+0 −15
Original line number Original line Diff line number Diff line
@@ -499,21 +499,6 @@ static inline void drv_sta_add_debugfs(struct ieee80211_local *local, 
		local->ops->sta_add_debugfs(&local->hw, &sdata->vif,

		local->ops->sta_add_debugfs(&local->hw, &sdata->vif,

					    sta, dir);

					    sta, dir);

}

}



static inline void drv_sta_remove_debugfs(struct ieee80211_local *local,

					  struct ieee80211_sub_if_data *sdata,

					  struct ieee80211_sta *sta,

					  struct dentry *dir)

{

	might_sleep();



	sdata = get_bss_sdata(sdata);

	check_sdata_in_driver(sdata);



	if (local->ops->sta_remove_debugfs)

		local->ops->sta_remove_debugfs(&local->hw, &sdata->vif,

					       sta, dir);

}

#endif

#endif





static inline void drv_sta_pre_rcu_remove(struct ieee80211_local *local,

static inline void drv_sta_pre_rcu_remove(struct ieee80211_local *local,