wifi: rtw89: regd: avoid using BITMAP_FROM_U64() to assign function bitmap
authorPing-Ke Shih <pkshih@realtek.com>
Wed, 5 Feb 2025 01:40:51 +0000 (09:40 +0800)
committerPing-Ke Shih <pkshih@realtek.com>
Mon, 10 Feb 2025 03:26:49 +0000 (11:26 +0800)
Since there are two function features for now, func_bitmap[] has single
one element, which BITMAP_FROM_U64() generating two elements is exceeded.
Change to assign function bitmap barely.

With i386-allmodconfig (a 32 bit system), it throws

 >> include/linux/bitmap.h:736:33: warning: excess elements in array initializer
      736 |                                 ((unsigned long) ((u64)(n) >> 32))
          |                                 ^
    drivers/net/wireless/realtek/rtw89/regd.c:16:34: note: in expansion of macro 'BITMAP_FROM_U64'
       16 |                 .func_bitmap = { BITMAP_FROM_U64(_fmap), },     \
          |                                  ^~~~~~~~~~~~~~~
    drivers/net/wireless/realtek/rtw89/regd.c:20:9: note: in expansion of macro 'COUNTRY_REGD'
       20 |         COUNTRY_REGD("00", RTW89_WW, RTW89_WW, RTW89_WW, 0x0);
          |         ^~~~~~~~~~~~

Fixes: 79a36fc56bea ("wifi: rtw89: regd: handle supported regulatory functions by country")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202502031932.BMQ4lhJT-lkp@intel.com/
Cc: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250205014051.13765-1-pkshih@realtek.com
drivers/net/wireless/realtek/rtw89/regd.c

index 505a3d0767c603609e881c27f18329f7f383b22e..0e67d0f128ddcae5d8a0e70e148f6be6cdfd9bbd 100644 (file)
@@ -16,9 +16,11 @@ void rtw89_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request
                .txpwr_regd[RTW89_BAND_2G] = _rule_2ghz,        \
                .txpwr_regd[RTW89_BAND_5G] = _rule_5ghz,        \
                .txpwr_regd[RTW89_BAND_6G] = _rule_6ghz,        \
-               .func_bitmap = { BITMAP_FROM_U64(_fmap), },     \
+               .func_bitmap = { _fmap, },      \
        }
 
+static_assert(BITS_PER_TYPE(unsigned long) >= NUM_OF_RTW89_REGD_FUNC);
+
 static const struct rtw89_regd rtw89_ww_regd =
        COUNTRY_REGD("00", RTW89_WW, RTW89_WW, RTW89_WW, 0x0);