iwlwifi: rtw88: rtw89: fix gcc warnings
Fix -Wno-format and unused variables warnings with gcc by adopting (to|the) FreeBSD-specific code. Reported by: jhb Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D39673
This commit is contained in:
parent
8dcf3a82c5
commit
f621b087c0
@ -164,7 +164,11 @@ _iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt,
|
||||
if (!iwl_fw_dbg_trigger_check_stop(fwrt, wdev, trigger))
|
||||
return;
|
||||
|
||||
#if defined(__linux__)
|
||||
iwl_fw_dbg_collect_trig(fwrt, trigger, NULL);
|
||||
#elif defined(__FreeBSD__)
|
||||
iwl_fw_dbg_collect_trig(fwrt, trigger, "");
|
||||
#endif
|
||||
}
|
||||
|
||||
#define iwl_fw_dbg_trigger_simple_stop(fwrt, wdev, trig) \
|
||||
|
@ -49,7 +49,7 @@ void __iwl_ ##fn(struct device *dev, const char *fmt, ...) \
|
||||
\
|
||||
va_start(args, fmt); \
|
||||
vaf.va = &args; \
|
||||
vasprintf(&str, M_KMALLOC, fmt, args); \
|
||||
vasprintf(&str, M_KMALLOC, vaf.fmt, args); \
|
||||
dev_ ##fn(dev, "%s", str); \
|
||||
trace_iwlwifi_ ##fn(&vaf); \
|
||||
free(str, M_KMALLOC); \
|
||||
@ -88,7 +88,7 @@ void __iwl_err(struct device *dev, enum iwl_err_mode mode, const char *fmt, ...)
|
||||
dev_err(dev, "%pV", &vaf);
|
||||
#elif defined(__FreeBSD__)
|
||||
char *str;
|
||||
vasprintf(&str, M_KMALLOC, fmt, args2);
|
||||
vasprintf(&str, M_KMALLOC, vaf.fmt, args2);
|
||||
dev_err(dev, "%s%s", (mode == IWL_ERR_MODE_RFKILL) ? "(RFKILL)" : "", str);
|
||||
free(str, M_KMALLOC);
|
||||
#endif
|
||||
@ -154,7 +154,7 @@ void __iwl_dbg(struct device *dev,
|
||||
dev_printk(KERN_DEBUG, dev, "%s %pV", function, &vaf);
|
||||
#elif defined(__FreeBSD__)
|
||||
char *str;
|
||||
vasprintf(&str, M_KMALLOC, fmt, args);
|
||||
vasprintf(&str, M_KMALLOC, vaf.fmt, args);
|
||||
dev_printk(KERN_DEBUG, dev, "%d %u %s %s",
|
||||
curthread->td_tid, (unsigned int)ticks, function, str);
|
||||
free(str, M_KMALLOC);
|
||||
|
@ -1438,7 +1438,11 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
|
||||
|
||||
if (rx_missed_bcon_since_rx >= stop_trig_missed_bcon_since_rx ||
|
||||
rx_missed_bcon >= stop_trig_missed_bcon)
|
||||
#if defined(__linux__)
|
||||
iwl_fw_dbg_collect_trig(&mvm->fwrt, trigger, NULL);
|
||||
#elif defined(__FreeBSD__)
|
||||
iwl_fw_dbg_collect_trig(&mvm->fwrt, trigger, "");
|
||||
#endif
|
||||
|
||||
out:
|
||||
rcu_read_unlock();
|
||||
|
@ -427,7 +427,11 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
|
||||
|
||||
if (rx_status->signal < rssi)
|
||||
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig,
|
||||
#if defined(__linux__)
|
||||
NULL);
|
||||
#elif defined(__FreeBSD__)
|
||||
"");
|
||||
#endif
|
||||
}
|
||||
|
||||
if (!mvm->tcm.paused && len >= sizeof(*hdr) &&
|
||||
@ -692,7 +696,11 @@ iwl_mvm_rx_stats_check_trigger(struct iwl_mvm *mvm, struct iwl_rx_packet *pkt)
|
||||
if (le32_to_cpup((__le32 *) (pkt->data + trig_offset)) < trig_thold)
|
||||
return;
|
||||
|
||||
#if defined(__linux__)
|
||||
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig, NULL);
|
||||
#elif defined(__FreeBSD__)
|
||||
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig, "");
|
||||
#endif
|
||||
}
|
||||
|
||||
static void iwl_mvm_stats_energy_iter(void *_data,
|
||||
|
@ -1958,7 +1958,11 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
|
||||
|
||||
if (rx_status->signal < rssi)
|
||||
iwl_fw_dbg_collect_trig(&mvm->fwrt, trig,
|
||||
#if defined(__linux__)
|
||||
NULL);
|
||||
#elif defined(__FreeBSD__)
|
||||
"");
|
||||
#endif
|
||||
}
|
||||
|
||||
if (ieee80211_is_data(hdr->frame_control))
|
||||
|
@ -1284,7 +1284,7 @@ void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask,
|
||||
#if defined(__linux__)
|
||||
dev_printk(KERN_DEBUG, rtwdev->dev, "%pV", &vaf);
|
||||
#elif defined(__FreeBSD__)
|
||||
vlog(LOG_DEBUG, fmt, args);
|
||||
vlog(LOG_DEBUG, vaf.fmt, args);
|
||||
#endif
|
||||
|
||||
va_end(args);
|
||||
|
@ -2655,7 +2655,7 @@ void __rtw89_debug(struct rtw89_dev *rtwdev,
|
||||
#elif defined(__FreeBSD__)
|
||||
{
|
||||
char *str;
|
||||
vasprintf(&str, M_KMALLOC, fmt, args);
|
||||
vasprintf(&str, M_KMALLOC, vaf.fmt, args);
|
||||
dev_printk(KERN_DEBUG, rtwdev->dev, "%s", str);
|
||||
free(str, M_KMALLOC);
|
||||
}
|
||||
|
@ -63,10 +63,4 @@ CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1
|
||||
#CFLAGS+= -DCONFIG_THERMAL=1
|
||||
#CFLAGS+= -DCONFIG_EFI=1
|
||||
|
||||
# GCC warns about NULL format strings passed to iwl_fw_dbg_collect_trig
|
||||
CWARNFLAGS.gcc+= -Wno-format
|
||||
|
||||
# GCC warns about set but unused vaf variables
|
||||
CWARNFLAGS.iwl-debug.c+= ${NO_WUNUSED_BUT_SET_VARIABLE}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -40,7 +40,4 @@ CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_RTW88_DEBUG
|
||||
#CFLAGS+= -DCONFIG_RTW88_DEBUGFS
|
||||
|
||||
# GCC warns about set but unused vaf variables
|
||||
CWARNFLAGS.debug.c+= ${NO_WUNUSED_BUT_SET_VARIABLE}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user