On Tue, 2019-08-06 at 22:15 -0700, Nathan Chancellor wrote:
> Just for everyone else (since I commented on our issue tracker), this is
> now fixed in Linus's tree as of commit  1f6607250331 ("iwlwifi: dbg_ini:
> fix compile time assert build errors").

I think this change is incomplete and suggest you add this
to remove the use of another const char * format.

---
 drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c 
b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 4d81776f576d..6b15e2e8cd37 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2593,20 +2593,20 @@ static void iwl_fw_dbg_update_regions(struct 
iwl_fw_runtime *fwrt,
 {
        void *iter = (void *)tlv->region_config;
        int i, size = le32_to_cpu(tlv->num_regions);
-       const char *err_st =
-               "WRT: ext=%d. Invalid region %s %d for apply point %d\n";
 
        for (i = 0; i < size; i++) {
                struct iwl_fw_ini_region_cfg *reg = iter, **active;
                int id = le32_to_cpu(reg->region_id);
                u32 type = le32_to_cpu(reg->region_type);
 
-               if (WARN(id >= ARRAY_SIZE(fwrt->dump.active_regs), err_st, ext,
-                        "id", id, pnt))
+               if (WARN(id >= ARRAY_SIZE(fwrt->dump.active_regs),
+                        "WRT: ext=%d. Invalid region id %d for apply point 
%d\n",
+                        ext, id, pnt))
                        break;
 
-               if (WARN(type == 0 || type >= IWL_FW_INI_REGION_NUM, err_st,
-                        ext, "type", type, pnt))
+               if (WARN(type == 0 || type >= IWL_FW_INI_REGION_NUM,
+                        "WRT: ext=%d. Invalid region type %d for apply point 
%d\n",
+                        ext, type, pnt))
                        break;
 
                active = &fwrt->dump.active_regs[id];


Reply via email to