Skip to contentSkip to conversation

Staging: rtl8723bs: remove useless macro and obsolete comment

PATCH In review Marco Cesati 2 participants 3 messages Mar 24, 2021 – Mar 26, 2021 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8723bs: remove useless macro and obsolete comment

Remove two no-op macros, two related helper macrors, and one related comment in the staging/rtl8723bs driver.

---
 drivers/staging/rtl8723bs/include/osdep_service.h | 7 -------
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 --
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c      | 2 --
 drivers/staging/rtl8723bs/os_dep/xmit_linux.c     | 4 +---
 4 files changed, 1 insertion(+), 14 deletions(-)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -7
index 9405bdb2abf0..b49838c7e457 100644
@@ -58,13 +58,6 @@
 
 extern int RTW_STATUS_CODE(int error_code);
 
-/* flags used for rtw_mstat_update() */
-
-#define mstat_tf_idx(flags) ((flags)&0xff)
-#define mstat_ff_idx(flags) (((flags)&0xff00) >> 8)
-
-#define rtw_mstat_update(flag, status, sz) do {} while (0)
-#define rtw_mstat_dump(sel) do {} while (0)
 void *_rtw_zmalloc(u32 sz);
 void *_rtw_malloc(u32 sz);
 void _kfree(u8 *pbuf, u32 sz);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -2
index a577ddcce8cd..2c12feff0978 100644
@@ -2386,8 +2386,6 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
 	if (!skb)
 		goto fail;
 
-	rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
-
 	if (unlikely(skb->len < sizeof(struct ieee80211_radiotap_header)))
 		goto fail;
 
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +0 -2
index 8f8549eee23e..79f51fd5648e 100644
@@ -580,8 +580,6 @@ static void __exit rtw_drv_halt(void)
 	rtw_ndev_notifier_unregister();
 
 	DBG_871X_LEVEL(_drv_always_, "module exit success\n");
-
-	rtw_mstat_dump(RTW_DBGDUMP);
 }
 
 
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +1 -3
index a3b6584ca0d0..216b2f62eefd 100644
@@ -248,10 +248,8 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
 {
 	int ret = 0;
 
-	if (pkt) {
-		rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, pkt->truesize);
+	if (pkt)
 		ret = _rtw_xmit_entry(pkt, pnetdev);
-	}
 
 	return ret;
 }
Signature · 1 line
2.30.2
#2 lore raw
Quoted 7 lines · Greg Kroah-Hartman
Quoted 4 lines · Marco Cesati

Remove two no-op macros, two related helper macrors, and one related comment in the staging/rtl8723bs driver.

Does not apply to my tree :(

Yeah, it was supposed to be applied on top of the patch set "remove unreferenced enums" (alternative to the patch set "remove named enums", which you applied)

Sorry again,

Marco

----
Marco Cesati, PhD
Dept. of Civil Engineering and Computer Science Engineering Univ. of Rome Tor Vergata
via del Politecnico 1, I-00133 Rome, Italy
Tel. +39 06 7259 7389