lkml.org 
[lkml]   [2021]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] staging: rtl8723bs: core: rtw_mlme_ext.c: move the declaration and initialization of 'evt_seq' inside ifdef macro
Date
'evt_seq' is only used if 'CHECK_ENENT_SEQ' is defined, however,
it's declared and initialized even if 'CHECK_ENENT_SEQ' is not
defined. Thus gcc will report following warning if
'CHECK_ENENT_SEQ' is not defined:

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:6009:15: warning:
variable ‘evt_seq’ set but not used [-Wunused-but-set-variable]
6009 | u8 evt_code, evt_seq;

Thus move the declaration and initialization of 'evt_seq' inside
ifdef macro to fix it.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 97b3c2965770..e883371cc96d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -6006,7 +6006,10 @@ static struct fwevent wlanevents[] = {

u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
{
- u8 evt_code, evt_seq;
+#ifdef CHECK_EVENT_SEQ
+ u8 evt_seq;
+#endif
+ u8 evt_code;
u16 evt_sz;
uint *peventbuf;
void (*event_callback)(struct adapter *dev, u8 *pbuf);
@@ -6017,18 +6020,17 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)

peventbuf = (uint *)pbuf;
evt_sz = (u16)(*peventbuf&0xffff);
- evt_seq = (u8)((*peventbuf>>24)&0x7f);
evt_code = (u8)((*peventbuf>>16)&0xff);

-
- #ifdef CHECK_EVENT_SEQ
+#ifdef CHECK_EVENT_SEQ
/* checking event sequence... */
+ evt_seq = (u8)((*peventbuf>>24)&0x7f);
if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
pevt_priv->event_seq = (evt_seq+1)&0x7f;

goto _abort_event_;
}
- #endif
+#endif

/* checking if event code is valid */
if (evt_code >= MAX_C2HEVT)
--
2.25.4
\
 
 \ /
  Last update: 2021-05-29 11:21    [W:0.056 / U:0.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site