From: Nikolay Kulikov Date: Tue, 7 Apr 2026 14:33:30 +0000 (+0300) Subject: staging: rtl8723bs: remove the rtw_warn_on() macro X-Git-Tag: v7.2-rc1~66^2~164 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ba46e6205566cea837cfb9b9cef9f13623602bd4;p=thirdparty%2Flinux.git staging: rtl8723bs: remove the rtw_warn_on() macro Remove the rtw_warn_on() macro, which simply calls WARN_ON(), and replace all its uses with the standard WARN_ON(). Signed-off-by: Nikolay Kulikov Link: https://patch.msgid.link/20260407143622.9767-6-nikolayof23@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index c1185c25ed369..72d5905a48e95 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1603,7 +1603,7 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u8 *buf, u16 buf_len) cmd_idx = info->cid; if (info->len > buf_len - 2) { - rtw_warn_on(1); + WARN_ON(1); len = buf_len - 2; } else { len = info->len; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 8e9387ad28105..3ecf4f979c034 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1697,7 +1697,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) struct wlan_network *candidate = NULL; if (!mlme->cur_network_scanned) { - rtw_warn_on(1); + WARN_ON(1); return ret; } diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 5f00fe282d1be..3d7beb83887db 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -3082,7 +3082,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow else rtw_hal_macid_wakeup(padapter, psta->mac_id); } else { - rtw_warn_on(1); + WARN_ON(1); } do { @@ -5890,7 +5890,7 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset bool connect_allow = true; if (!ch || !bw || !offset) { - rtw_warn_on(1); + WARN_ON(1); connect_allow = false; } diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 6a7c09db4cd93..c04419c9c3fc3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -577,7 +577,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid) netdev_dbg(adapter->pnetdev, FUNC_ADPT_FMT " group key with invalid key id:%u\n", FUNC_ADPT_ARG(adapter), kid); - rtw_warn_on(1); + WARN_ON(1); goto bitmap_handle; } @@ -623,7 +623,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid) netdev_dbg(adapter->pnetdev, FUNC_ADPT_FMT " group key id:%u no room\n", FUNC_ADPT_ARG(adapter), kid); - rtw_warn_on(1); + WARN_ON(1); goto bitmap_handle; } diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 9320ce86f1b92..dba146b696e07 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -2037,7 +2037,7 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe) allow = true; else if (registry->hiq_filter == RTW_HIQ_FILTER_DENY_ALL) { } else - rtw_warn_on(1); + WARN_ON(1); return allow; } diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c index 728a2171fbcb0..4e3cd1547e010 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -576,7 +576,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val) switch (variable) { case HW_VAR_INIT_RTS_RATE: - rtw_warn_on(1); + WARN_ON(1); break; case HW_VAR_SEC_CFG: { diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index cd73fa294a560..99c26b446f729 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -64,7 +64,6 @@ static inline void flush_signals_thread(void) flush_signals(current); } -#define rtw_warn_on(condition) WARN_ON(condition) #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) extern void rtw_free_netdev(struct net_device *netdev); diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index fd3bae31b0edb..a55c6808755e4 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -377,7 +377,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) rtw_cfg80211_inform_bss(padapter, cur_network); } else { if (!scanned) { - rtw_warn_on(1); + WARN_ON(1); return; } if (!memcmp(&scanned->network.ssid, &pnetwork->ssid, @@ -385,7 +385,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) !memcmp(scanned->network.mac_address, pnetwork->mac_address, ETH_ALEN)) rtw_cfg80211_inform_bss(padapter, scanned); else - rtw_warn_on(1); + WARN_ON(1); } if (!rtw_cfg80211_check_bss(padapter)) @@ -418,7 +418,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) struct wlan_network *scanned = pmlmepriv->cur_network_scanned; if (!scanned) { - rtw_warn_on(1); + WARN_ON(1); goto check_bss; } @@ -427,7 +427,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) sizeof(struct ndis_802_11_ssid))) rtw_cfg80211_inform_bss(padapter, scanned); else - rtw_warn_on(1); + WARN_ON(1); } check_bss: