staging: rtl8723bs: Remove redundant MAC_ARG macro
PATCH 1/1 staging: rtl8723bs: Remove redundant MAC_ARG macro
The MAC_ARG(x) macro is a useless identity macro that just returns its argument unchanged. It was used alongside the %pM format specifier for printing MAC addresses, but %pM already handles MAC address formatting directly without needing any wrapper macro.
This commit removes the macro definition from both:
include/osdep_service.hinclude/ieee80211.h
And removes all 6 usages throughout the driver
Signed-off-by Yuvraj Singh Chauhan <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 1 - drivers/staging/rtl8723bs/include/osdep_service.h | 4 ---- 5 files changed, 6 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -930,7 +930,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueuwhile ((cam_id =rtw_camid_search (padapter, sta->hwaddr,-1 )) >=0 ) {netdev_dbg (padapter->pnetdev,"clear key for addr:%pM, camid:%d\n" , -MAC_ARG (sta->hwaddr), cam_id); + sta->hwaddr, cam_id);clear_cam_entry (padapter, cam_id);rtw_camid_free (padapter, cam_id); }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4
@@ -5604,7 +5604,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)write_cam (padapter, cam_id, ctrl, addr, pparm->key);netdev_dbg (padapter->pnetdev,"set group key camid:%d, addr:%pM, kid:%d, type:%s\n" , - cam_id,MAC_ARG (addr), pparm->keyid, + cam_id, addr, pparm->keyid,security_type_str (pparm->algorithm)); }
@@ -5634,7 +5634,7 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf) psta =rtw_get_stainfo (pstapriv, pparm->addr);if (!psta) {netdev_dbg (padapter->pnetdev,"%s sta:%pM not found\n" , - __func__,MAC_ARG (pparm->addr)); + __func__, pparm->addr); ret =H2C_REJECTED ; goto exit; }
@@ -5649,14 +5649,14 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)while ((cam_id =rtw_camid_search (padapter, pparm->addr,-1 )) >=0 ) {netdev_dbg (padapter->pnetdev,"clear key for addr:%pM, camid:%d\n" , -MAC_ARG (pparm->addr), cam_id); + pparm->addr, cam_id);clear_cam_entry (padapter, cam_id);rtw_camid_free (padapter, cam_id); } }else {netdev_dbg (padapter->pnetdev,"set pairwise key camid:%d, addr:%pM, kid:%d, type:%s\n" , - cam_id,MAC_ARG (pparm->addr), pparm->keyid, + cam_id, pparm->addr, pparm->keyid,security_type_str (pparm->algorithm)); ctrl =BIT (15 ) | ((pparm->algorithm) <<2 ) | pparm->keyid;write_cam (padapter, cam_id, ctrl, pparm->addr, pparm->key);
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -617,7 +617,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)netdev_dbg (adapter->pnetdev,FUNC_ADPT_FMT " pairwise key with %pM id:%u no room\n" ,FUNC_ADPT_ARG (adapter), -MAC_ARG (sta->hwaddr), kid); + sta->hwaddr, kid); else netdev_dbg(adapter->pnetdev, FUNC_ADPT_FMT " group key id:%u no room\n",
drivers/staging/rtl8723bs/include/ieee80211.h +0 -1
@@ -506,7 +506,6 @@ Total: 28-2340 bytes#define DEFAULT_MAX_SCAN_AGE (15 * HZ)#define DEFAULT_FTS 2346 -#define MAC_ARG (x) (x)#define IP_ARG (x) (x)static inline int is_multicast_mac_addr (const u8 *addr)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -4
@@ -91,10 +91,6 @@ static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *par#define _RND (sz, r) ((((sz)+((r)-1))/(r))*(r)) -#ifndef MAC_ARG -#define MAC_ARG (x) (x) -#endif -extern void rtw_free_netdev (struct net_device *netdev);/* Macros for handling unaligned memory accesses */
Signature · 1 line
2.34.1