Commit 19cf9d7a authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove LIST_CONTAINOR 



Remove unnecessary macro for container_of and call it directly.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201206034517.4276-9-ross.schm.dev@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+8 −8
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void expire_timeout_chk(struct adapter *padapter) 
	}

	#endif

	while (phead != plist) {

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

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



		plist = get_next(plist);
@@ -268,7 +268,7 @@ void expire_timeout_chk(struct adapter *padapter) 
	}

	#endif

	while (phead != plist) {

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

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

		plist = get_next(plist);

#ifdef CONFIG_AUTO_AP_MODE

		if (psta->isrc)
@@ -1344,7 +1344,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) 
	plist = get_next(phead);



	while (phead != plist) {

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

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

		plist = get_next(plist);



		if (!memcmp(paclnode->addr, addr, ETH_ALEN)) {
@@ -1405,7 +1405,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) 
	plist = get_next(phead);



	while (phead != plist) {

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

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

		plist = get_next(plist);



		if (
@@ -1912,7 +1912,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated) 


		/* check asoc_queue */

		while (phead != plist) {

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

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



			plist = get_next(plist);
@@ -2193,7 +2193,7 @@ void rtw_sta_flush(struct adapter *padapter) 


	/* free sta asoc_queue */

	while (phead != plist) {

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

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



		plist = get_next(plist);
@@ -2297,7 +2297,7 @@ void rtw_ap_restore_network(struct adapter *padapter) 
	while (phead != plist) {

		int stainfo_offset;



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

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

		plist = get_next(plist);



		stainfo_offset = rtw_stainfo_offset(pstapriv, psta);
@@ -2402,7 +2402,7 @@ void stop_ap_mode(struct adapter *padapter) 
	phead = get_list_head(pacl_node_q);

	plist = get_next(phead);

	while (phead != plist) {

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

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

		plist = get_next(plist);



		if (paclnode->valid) {

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) 
	if (list_empty(&(queue->queue)))

		obj = NULL;

	else {

		obj = LIST_CONTAINOR(get_next(&(queue->queue)), struct cmd_obj, list);

		obj = container_of(get_next(&(queue->queue)), struct cmd_obj, list);

		list_del_init(&obj->list);

	}

drivers/staging/rtl8723bs/core/rtw_mlme.c

+9 −9
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue) 


	else

	{

		pnetwork = LIST_CONTAINOR(get_next(&queue->queue), struct wlan_network, list);

		pnetwork = container_of(get_next(&queue->queue), struct wlan_network, list);



		list_del_init(&(pnetwork->list));

	}
@@ -156,7 +156,7 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) 
	}

	plist = get_next(&(free_queue->queue));



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

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



	list_del_init(&pnetwork->list);
@@ -256,7 +256,7 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr) 
	plist = get_next(phead);



	while (plist != phead) {

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

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



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

			break;
@@ -287,7 +287,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) 


	while (phead != plist) {



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

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



		plist = get_next(plist);
@@ -438,7 +438,7 @@ struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, struc 
	plist = get_next(phead);



	while (plist != phead) {

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

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



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

			break;
@@ -468,7 +468,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) 
		if (phead == plist)

			break;



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

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



		if (!pwlan->fixed) {

			if (oldest == NULL || time_after(oldest->last_scanned, pwlan->last_scanned))
@@ -589,7 +589,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
		if (phead == plist)

			break;



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

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



		rtw_bug_check(pnetwork, pnetwork, pnetwork, pnetwork);
@@ -1947,7 +1947,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) 


	while (phead != mlme->pscanned) {



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

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

		if (!pnetwork) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n", __func__));

			ret = _FAIL;
@@ -2077,7 +2077,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 


	while (phead != pmlmepriv->pscanned) {



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

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

		if (!pnetwork) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n", __func__));

			ret = _FAIL;

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -4119,7 +4119,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 
			if (phead == plist)

				break;



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

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



			plist = get_next(plist);
@@ -5601,7 +5601,7 @@ void _linked_info_dump(struct adapter *padapter) 
			phead = &pstapriv->asoc_list;

			plist = get_next(phead);

			while (phead != plist) {

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

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

				plist = get_next(plist);



				DBG_871X("STA[%pM]:UndecoratedSmoothedPWDB:%d\n",
@@ -6693,7 +6693,7 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigned char *pbuf) 
		xmitframe_plist = get_next(xmitframe_phead);



		while (xmitframe_phead != xmitframe_plist) {

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

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



			xmitframe_plist = get_next(xmitframe_plist);

drivers/staging/rtl8723bs/core/rtw_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue) 


		plist = get_next(phead);



		precvbuf = LIST_CONTAINOR(plist, struct recv_buf, list);

		precvbuf = container_of(plist, struct recv_buf, list);



		list_del_init(&precvbuf->list);
@@ -1132,7 +1132,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ 
			xmitframe_plist = get_next(xmitframe_phead);



			if (xmitframe_phead != xmitframe_plist) {

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

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



				xmitframe_plist = get_next(xmitframe_plist);