]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: iwlwifi: allow IWL_FW_CHECK() with just a string
authorJohannes Berg <johannes.berg@intel.com>
Tue, 8 Oct 2024 04:25:28 +0000 (07:25 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 23 Oct 2024 14:44:07 +0000 (16:44 +0200)
We require a message, but the macros shouldn't require a
formatted message, a constant one can be fine. Change the
macros to support that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241008072037.96e8554cb7a2.I0e06d8fd49f86bd4e9e216fc2265c43d7e78a095@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/fw/dbg.h

index 9d8f89adc322856af1c91878eeee2fde96322343..f4803b55adb9172ecdcb93dabd0a2f7925d186e9 100644 (file)
@@ -331,15 +331,15 @@ bool iwl_fwrt_read_err_table(struct iwl_trans *trans, u32 base, u32 *err_id);
 void iwl_fw_disable_dbg_asserts(struct iwl_fw_runtime *fwrt);
 void iwl_fw_dbg_clear_monitor_buf(struct iwl_fw_runtime *fwrt);
 
-#define IWL_FW_CHECK_FAILED(_obj, _fmt, ...)                           \
-       IWL_ERR_LIMIT(_obj, _fmt, __VA_ARGS__)
+#define IWL_FW_CHECK_FAILED(_obj, ...)                                 \
+       IWL_ERR_LIMIT(_obj, __VA_ARGS__)
 
 #define IWL_FW_CHECK(_obj, _cond, _fmt, ...)                           \
        ({                                                              \
                bool __cond = (_cond);                                  \
                                                                        \
                if (unlikely(__cond))                                   \
-                       IWL_FW_CHECK_FAILED(_obj, _fmt, __VA_ARGS__);   \
+                       IWL_FW_CHECK_FAILED(_obj, _fmt, ##__VA_ARGS__); \
                                                                        \
                unlikely(__cond);                                       \
        })