Commit b3cd518c authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Use list iterators and helpers 



The rtl8723bs driver manually re-implements list helper functions
and macros in various ways. Replace with existing list helpers.

The following coccinelle script was used to convert the code.

@@
identifier v1, v2, v3, v4;
symbol next;
expression e;
iterator name list_for_each;
statement S;
@@

<+...
(
- e = v1->next;
|
- e = get_next(v1);
)
  ... when != e
- while ( \( v1 != e \| e != v1 \) )
+ list_for_each (e, v1)
  {
    ...
-   v2 = container_of(e, struct v3, v4);
+   v2 = list_entry(e, struct v3, v4);
?-  if (!v2) S
    ...
(
-   e = e->next;
|
- e = get_next(e);
)
    ... when != e
  }
...+>

@@
identifier v1, v2, v3, v4;
symbol next;
expression e;
iterator name list_for_each;
statement S;
@@

<+...
(
- e = v1->next;
|
- e = get_next(v1);
)
  ... when != e
- while (1)
+ list_for_each (e, v1)
  {
- if ( \( e == v1 \| v1 == e \) )
-   break;
    ...
-   v2 = container_of(e, struct v3, v4);
+   v2 = list_entry(e, struct v3, v4);
?-  if (!v2) S
    ...
(
-   e = e->next;
|
- e = get_next(e);
)
    ... when != e
  }
...+>

Manually fixed up formatting, and added auto-removed comments back in.
Compile tested only.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210428173301.149619-1-linux@roeck-us.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33ed2b70

drivers/staging/rtl8723bs/core/rtw_ap.c

+16 −42
Original line number Diff line number Diff line
@@ -188,13 +188,9 @@ void expire_timeout_chk(struct adapter *padapter) 
	spin_lock_bh(&pstapriv->auth_list_lock);



	phead = &pstapriv->auth_list;

	plist = get_next(phead);



	/* check auth_queue */

	while (phead != plist) {

		psta = container_of(plist, struct sta_info, auth_list);



		plist = get_next(plist);

	list_for_each(plist, phead) {

		psta = list_entry(plist, struct sta_info, auth_list);



		if (psta->expire_to > 0) {

			psta->expire_to--;
@@ -217,12 +213,9 @@ void expire_timeout_chk(struct adapter *padapter) 
	spin_lock_bh(&pstapriv->asoc_list_lock);



	phead = &pstapriv->asoc_list;

	plist = get_next(phead);



	/* check asoc_queue */

	while (phead != plist) {

		psta = container_of(plist, struct sta_info, asoc_list);

		plist = get_next(plist);

	list_for_each(plist, phead) {

		psta = list_entry(plist, struct sta_info, asoc_list);

		if (chk_sta_is_alive(psta) || !psta->expire_to) {

			psta->expire_to = pstapriv->expire_to;

			psta->keep_alive_trycnt = 0;
@@ -1210,11 +1203,8 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) 
	spin_lock_bh(&(pacl_node_q->lock));



	phead = get_list_head(pacl_node_q);

	plist = get_next(phead);



	while (phead != plist) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

		plist = get_next(plist);

	list_for_each(plist, phead) {

		paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);



		if (!memcmp(paclnode->addr, addr, ETH_ALEN)) {

			if (paclnode->valid == true) {
@@ -1266,11 +1256,8 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) 
	spin_lock_bh(&(pacl_node_q->lock));



	phead = get_list_head(pacl_node_q);

	plist = get_next(phead);



	while (phead != plist) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

		plist = get_next(plist);

	list_for_each(plist, phead) {

		paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);



		if (

			!memcmp(paclnode->addr, addr, ETH_ALEN) ||
@@ -1716,13 +1703,9 @@ void associated_clients_update(struct adapter *padapter, u8 updated) 
		spin_lock_bh(&pstapriv->asoc_list_lock);



		phead = &pstapriv->asoc_list;

		plist = get_next(phead);



		/* check asoc_queue */

		while (phead != plist) {

			psta = container_of(plist, struct sta_info, asoc_list);



			plist = get_next(plist);

		list_for_each(plist, phead) {

			psta = list_entry(plist, struct sta_info, asoc_list);



			VCS_update(padapter, psta);

		}
@@ -1972,13 +1955,9 @@ void rtw_sta_flush(struct adapter *padapter) 


	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;

	plist = get_next(phead);



	/* free sta asoc_queue */

	while (phead != plist) {

		psta = container_of(plist, struct sta_info, asoc_list);



		plist = get_next(plist);

	list_for_each(plist, phead) {

		psta = list_entry(plist, struct sta_info, asoc_list);



		list_del_init(&psta->asoc_list);

		pstapriv->asoc_list_cnt--;
@@ -2074,13 +2053,10 @@ void rtw_ap_restore_network(struct adapter *padapter) 
	spin_lock_bh(&pstapriv->asoc_list_lock);



	phead = &pstapriv->asoc_list;

	plist = get_next(phead);



	while (phead != plist) {

	list_for_each(plist, phead) {

		int stainfo_offset;



		psta = container_of(plist, struct sta_info, asoc_list);

		plist = get_next(plist);

		psta = list_entry(plist, struct sta_info, asoc_list);



		stainfo_offset = rtw_stainfo_offset(pstapriv, psta);

		if (stainfo_offset_valid(stainfo_offset))
@@ -2183,10 +2159,8 @@ void stop_ap_mode(struct adapter *padapter) 
	/* for ACL */

	spin_lock_bh(&(pacl_node_q->lock));

	phead = get_list_head(pacl_node_q);

	plist = get_next(phead);

	while (phead != plist) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

		plist = get_next(plist);

	list_for_each(plist, phead) {

		paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);



		if (paclnode->valid) {

			paclnode->valid = false;

drivers/staging/rtl8723bs/core/rtw_mlme.c

+16 −56
Original line number Diff line number Diff line
@@ -242,15 +242,11 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr) 
	/* spin_lock_bh(&scanned_queue->lock); */



	phead = get_list_head(scanned_queue);

	plist = get_next(phead);



	while (plist != phead) {

		pnetwork = container_of(plist, struct wlan_network, list);

	list_for_each(plist, phead) {

		pnetwork = list_entry(plist, struct wlan_network, list);



		if (!memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN))

			break;



		plist = get_next(plist);

	}



	if (plist == phead)
@@ -272,13 +268,9 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) 
	spin_lock_bh(&scanned_queue->lock);



	phead = get_list_head(scanned_queue);

	plist = get_next(phead);



	while (phead != plist) {



		pnetwork = container_of(plist, struct wlan_network, list);

	list_for_each(plist, phead) {



		plist = get_next(plist);

		pnetwork = list_entry(plist, struct wlan_network, list);



		_rtw_free_network(pmlmepriv, pnetwork, isfreeall);
@@ -420,15 +412,11 @@ struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, struc 
	struct wlan_network *found = NULL;



	phead = get_list_head(scanned_queue);

	plist = get_next(phead);



	while (plist != phead) {

		found = container_of(plist, struct wlan_network, list);

	list_for_each(plist, phead) {

		found = list_entry(plist, struct wlan_network, list);



		if (is_same_network(&network->network, &found->network, 0))

			break;



		plist = get_next(plist);

	}



	if (plist == phead)
@@ -446,21 +434,14 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) 


	phead = get_list_head(scanned_queue);



	plist = get_next(phead);



	while (1) {



		if (phead == plist)

			break;

	list_for_each(plist, phead) {



		pwlan = container_of(plist, struct wlan_network, list);

		pwlan = list_entry(plist, struct wlan_network, list);



		if (!pwlan->fixed) {

			if (oldest == NULL || time_after(oldest->last_scanned, pwlan->last_scanned))

				oldest = pwlan;

		}



		plist = get_next(plist);

	}

	return oldest;
@@ -547,13 +528,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 


	spin_lock_bh(&queue->lock);

	phead = get_list_head(queue);

	plist = get_next(phead);



	while (1) {

		if (phead == plist)

			break;



		pnetwork = container_of(plist, struct wlan_network, list);

	list_for_each(plist, phead) {

		pnetwork = list_entry(plist, struct wlan_network, list);



		rtw_bug_check(pnetwork, pnetwork, pnetwork, pnetwork);
@@ -569,8 +545,6 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
		if (oldest == NULL || time_after(oldest->last_scanned, pnetwork->last_scanned))

			oldest = pnetwork;



		plist = get_next(plist);



	}



	/* If we didn't find a match, then get a new network slot to initialize
@@ -1786,17 +1760,10 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) 
	spin_lock_bh(&(mlme->scanned_queue.lock));

	phead = get_list_head(queue);



	mlme->pscanned = get_next(phead);



	while (phead != mlme->pscanned) {

	list_for_each(mlme->pscanned, phead) {



		pnetwork = container_of(mlme->pscanned, struct wlan_network, list);

		if (!pnetwork) {

			ret = _FAIL;

			goto exit;

		}



		mlme->pscanned = get_next(mlme->pscanned);

		pnetwork = list_entry(mlme->pscanned, struct wlan_network,

				      list);



		rtw_check_roaming_candidate(mlme, &candidate, pnetwork);
@@ -1890,17 +1857,10 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 
	}



	phead = get_list_head(queue);

	pmlmepriv->pscanned = get_next(phead);



	while (phead != pmlmepriv->pscanned) {



		pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);

		if (!pnetwork) {

			ret = _FAIL;

			goto exit;

		}

	list_for_each(pmlmepriv->pscanned, phead) {



		pmlmepriv->pscanned = get_next(pmlmepriv->pscanned);

		pnetwork = list_entry(pmlmepriv->pscanned,

				      struct wlan_network, list);



		rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork);

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+6 −10
Original line number Diff line number Diff line
@@ -5135,10 +5135,9 @@ void _linked_info_dump(struct adapter *padapter) 


			spin_lock_bh(&pstapriv->asoc_list_lock);

			phead = &pstapriv->asoc_list;

			plist = get_next(phead);

			while (phead != plist) {

				psta = container_of(plist, struct sta_info, asoc_list);

				plist = get_next(plist);

			list_for_each(plist, phead) {

				psta = list_entry(plist, struct sta_info,

						  asoc_list);

			}

			spin_unlock_bh(&pstapriv->asoc_list_lock);
@@ -6108,12 +6107,9 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigned char *pbuf) 
		spin_lock_bh(&pxmitpriv->lock);



		xmitframe_phead = get_list_head(&psta_bmc->sleep_q);

		xmitframe_plist = get_next(xmitframe_phead);



		while (xmitframe_phead != xmitframe_plist) {

			pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list);



			xmitframe_plist = get_next(xmitframe_plist);

		list_for_each(xmitframe_plist, xmitframe_phead) {

			pxmitframe = list_entry(xmitframe_plist,

						struct xmit_frame, list);



			list_del_init(&pxmitframe->list);

drivers/staging/rtl8723bs/core/rtw_sta_mgt.c

+9 −20
Original line number Diff line number Diff line
@@ -148,13 +148,11 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) 
		spin_lock_bh(&pstapriv->sta_hash_lock);

		for (index = 0; index < NUM_STA; index++) {

			phead = &(pstapriv->sta_hash[index]);

			plist = get_next(phead);



			while (phead != plist) {

			list_for_each(plist, phead) {

				int i;



				psta = container_of(plist, struct sta_info, hash_list);

				plist = get_next(plist);

				psta = list_entry(plist, struct sta_info,

						  hash_list);



				for (i = 0; i < 16 ; i++) {

					preorder_ctrl = &psta->recvreorder_ctrl[i];
@@ -438,12 +436,8 @@ void rtw_free_all_stainfo(struct adapter *padapter) 


	for (index = 0; index < NUM_STA; index++) {

		phead = &(pstapriv->sta_hash[index]);

		plist = get_next(phead);



		while (phead != plist) {

			psta = container_of(plist, struct sta_info, hash_list);



			plist = get_next(plist);

		list_for_each(plist, phead) {

			psta = list_entry(plist, struct sta_info, hash_list);



			if (pbcmc_stainfo != psta)

				rtw_free_stainfo(padapter, psta);
@@ -475,17 +469,14 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) 
	spin_lock_bh(&pstapriv->sta_hash_lock);



	phead = &(pstapriv->sta_hash[index]);

	plist = get_next(phead);



	while (phead != plist) {

		psta = container_of(plist, struct sta_info, hash_list);

	list_for_each(plist, phead) {

		psta = list_entry(plist, struct sta_info, hash_list);



		if ((!memcmp(psta->hwaddr, addr, ETH_ALEN)))

		 /*  if found the matched address */

			break;



		psta = NULL;

		plist = get_next(plist);

	}



	spin_unlock_bh(&pstapriv->sta_hash_lock);
@@ -531,10 +522,8 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) 


	spin_lock_bh(&(pacl_node_q->lock));

	phead = get_list_head(pacl_node_q);

	plist = get_next(phead);

	while (phead != plist) {

		paclnode = container_of(plist, struct rtw_wlan_acl_node, list);

		plist = get_next(plist);

	list_for_each(plist, phead) {

		paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);



		if (!memcmp(paclnode->addr, mac_addr, ETH_ALEN))

			if (paclnode->valid == true) {

drivers/staging/rtl8723bs/core/rtw_xmit.c

+13 −30
Original line number Diff line number Diff line
@@ -1729,12 +1729,8 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram 
	spin_lock_bh(&pframequeue->lock);



	phead = get_list_head(pframequeue);

	plist = get_next(phead);



	while (phead != plist) {

		pxmitframe = container_of(plist, struct xmit_frame, list);



		plist = get_next(plist);

	list_for_each(plist, phead) {

		pxmitframe = list_entry(plist, struct xmit_frame, list);



		rtw_free_xmitframe(pxmitpriv, pxmitframe);

	}
@@ -2134,12 +2130,8 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc 
	struct hw_xmit *phwxmits =  padapter->xmitpriv.hwxmits;



	phead = get_list_head(pframequeue);

	plist = get_next(phead);



	while (phead != plist) {

		pxmitframe = container_of(plist, struct xmit_frame, list);



		plist = get_next(plist);

	list_for_each(plist, phead) {

		pxmitframe = list_entry(plist, struct xmit_frame, list);



		pattrib = &pxmitframe->attrib;
@@ -2209,12 +2201,9 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) 
	spin_lock_bh(&pxmitpriv->lock);



	xmitframe_phead = get_list_head(&psta->sleep_q);

	xmitframe_plist = get_next(xmitframe_phead);



	while (xmitframe_phead != xmitframe_plist) {

		pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list);



		xmitframe_plist = get_next(xmitframe_plist);

	list_for_each(xmitframe_plist, xmitframe_phead) {

		pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,

					list);



		list_del_init(&pxmitframe->list);
@@ -2283,12 +2272,9 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) 


	if ((pstapriv->sta_dz_bitmap&0xfffe) == 0x0) { /* no any sta in ps mode */

		xmitframe_phead = get_list_head(&psta_bmc->sleep_q);

		xmitframe_plist = get_next(xmitframe_phead);



		while (xmitframe_phead != xmitframe_plist) {

			pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list);



			xmitframe_plist = get_next(xmitframe_plist);

		list_for_each(xmitframe_plist, xmitframe_phead) {

			pxmitframe = list_entry(xmitframe_plist,

						struct xmit_frame, list);



			list_del_init(&pxmitframe->list);
@@ -2330,12 +2316,9 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst 
	spin_lock_bh(&pxmitpriv->lock);



	xmitframe_phead = get_list_head(&psta->sleep_q);

	xmitframe_plist = get_next(xmitframe_phead);



	while (xmitframe_phead != xmitframe_plist) {

		pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list);



		xmitframe_plist = get_next(xmitframe_plist);

	list_for_each(xmitframe_plist, xmitframe_phead) {

		pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,

					list);



		switch (pxmitframe->attrib.priority) {

		case 1: