Merge tag 'driver-core-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / net / mac80211 / debugfs_sta.c

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 0185e6e5e5d1f4a730812032a9d5459ca3766bab..b3c9001d1f43d92a87104738b2de972a7e5425e2 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -951,12 +951,7 @@ STA_OPS(he_capa);
                sta->debugfs_dir, sta, &sta_ ##name## _ops);
 
 #define DEBUGFS_ADD_COUNTER(name, field)                               \
-       if (sizeof(sta->field) == sizeof(u32))                          \
-               debugfs_create_u32(#name, 0400, sta->debugfs_dir,       \
-                       (u32 *) &sta->field);                           \
-       else                                                            \
-               debugfs_create_u64(#name, 0400, sta->debugfs_dir,       \
-                       (u64 *) &sta->field);
+       debugfs_create_ulong(#name, 0400, sta->debugfs_dir, &sta->field);
 
 void ieee80211_sta_debugfs_add(struct sta_info *sta)
 {
@@ -1001,14 +996,8 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
                                    NL80211_EXT_FEATURE_AIRTIME_FAIRNESS))
                DEBUGFS_ADD(airtime);
 
-       if (sizeof(sta->driver_buffered_tids) == sizeof(u32))
-               debugfs_create_x32("driver_buffered_tids", 0400,
-                                  sta->debugfs_dir,
-                                  (u32 *)&sta->driver_buffered_tids);
-       else
-               debugfs_create_x64("driver_buffered_tids", 0400,
-                                  sta->debugfs_dir,
-                                  (u64 *)&sta->driver_buffered_tids);
+       debugfs_create_xul("driver_buffered_tids", 0400, sta->debugfs_dir,
+                          &sta->driver_buffered_tids);
 
        drv_sta_add_debugfs(local, sdata, &sta->sta, sta->debugfs_dir);
 }