Skip to contentSkip to conversation

Staging: rtl8188eu: core: Use list_for_each_entry_safe

PATCH In review Srishti Sharma 3 participants 6 messages Oct 4, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8188eu: core: Use list_for_each_entry_safe

Use list_for_each_entry_safe to make the code more compact. Done by the following semantic patch by coccinelle.

@r@
struct list_head* l;
expression e;
identifier m,list_del_init,f;
type T1;
T1* pos;
iterator name list_for_each_entry_safe;
@@

f(...){

+T1* tmp;
<+...
-while(...)
+list_for_each_entry_safe(pos,tmp,l,m)
{
...
-pos = container_of(l,T1,m);
...
-l=e;
<+...
list_del_init(&pos->m)
...+>
}
...+>

}

---
 drivers/staging/rtl8188eu/core/rtw_ap.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +3 -9
index a2c599f..551af9e 100644
@@ -280,7 +280,7 @@ void	expire_timeout_chk(struct adapter *padapter)
 {
 	struct list_head *phead, *plist;
 	u8 updated = 0;
-	struct sta_info *psta = NULL;
+	struct sta_info *psta = NULL, *tmp;
 	struct sta_priv *pstapriv = &padapter->stapriv;
 	u8 chk_alive_num = 0;
 	char chk_alive_list[NUM_STA];
@@ -292,10 +292,7 @@ void	expire_timeout_chk(struct adapter *padapter)
 	plist = phead->next;
 
 	/* check auth_queue */
-	while (phead != plist) {
-		psta = container_of(plist, struct sta_info, auth_list);
-		plist = plist->next;
-
+	list_for_each_entry_safe(psta, tmp, plist, auth_list) {
 		if (psta->expire_to > 0) {
 			psta->expire_to--;
 			if (psta->expire_to == 0) {
@@ -326,10 +323,7 @@ void	expire_timeout_chk(struct adapter *padapter)
 	plist = phead->next;
 
 	/* check asoc_queue */
-	while (phead != plist) {
-		psta = container_of(plist, struct sta_info, asoc_list);
-		plist = plist->next;
-
+	list_for_each_entry_safe(psta, tmp, plist, asoc_list) {
 		if (chk_sta_is_alive(psta) || !psta->expire_to) {
 			psta->expire_to = pstapriv->expire_to;
 			psta->keep_alive_trycnt = 0;
Signature · 1 line
2.7.4
#1 lore raw

Again, you have three patches on different files with the same subject line. You could add the file name eg rtw_ap: to the subject line to make them unique.

julia

Quoted 83 lines · Srishti Sharma

Use list_for_each_entry_safe to make the code more compact. Done by the following semantic patch by coccinelle.

@r@
struct list_head* l;
expression e;
identifier m,list_del_init,f;
type T1;
T1* pos;
iterator name list_for_each_entry_safe;
@@

f(...){

+T1* tmp;
<+...

(quoted diff) +1 -1
-while(...)
+list_for_each_entry_safe(pos,tmp,l,m)

{
...

(quoted diff) +0 -2
-pos = container_of(l,T1,m);
...
-l=e;
 <+...
 list_del_init(&pos->m)
 ...+>

}
...+>

}

---
 drivers/staging/rtl8188eu/core/rtw_ap.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +3 -10
index a2c599f..551af9e 100644
@@ -280,7 +280,7 @@ void	expire_timeout_chk(struct adapter *padapter)
 {
 	struct list_head *phead, *plist;
 	u8 updated = 0;
-	struct sta_info *psta = NULL;
+	struct sta_info *psta = NULL, *tmp;
 	struct sta_priv *pstapriv = &padapter->stapriv;
 	u8 chk_alive_num = 0;
 	char chk_alive_list[NUM_STA];
@@ -292,10 +292,7 @@ void	expire_timeout_chk(struct adapter *padapter)
 	plist = phead->next;
 
 	/* check auth_queue */
-	while (phead != plist) {
-		psta = container_of(plist, struct sta_info, auth_list);
-		plist = plist->next;
-
+	list_for_each_entry_safe(psta, tmp, plist, auth_list) {
 		if (psta->expire_to > 0) {
 			psta->expire_to--;
 			if (psta->expire_to == 0) {
@@ -326,10 +323,7 @@ void	expire_timeout_chk(struct adapter *padapter)
 	plist = phead->next;
 
 	/* check asoc_queue */
-	while (phead != plist) {
-		psta = container_of(plist, struct sta_info, asoc_list);
-		plist = plist->next;
-
+	list_for_each_entry_safe(psta, tmp, plist, asoc_list) {
 		if (chk_sta_is_alive(psta) || !psta->expire_to) {
 			psta->expire_to = pstapriv->expire_to;
 			psta->keep_alive_trycnt = 0;
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1507122755-5489-1-git-send-email-srishtishar%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
Quoted 4 lines · Julia Lawall

Again, you have three patches on different files with the same subject line. You could add the file name eg rtw_ap: to the subject line to make them unique.

And the subject needs to start with [PATCH v3] and then after the Signed off by line put:

---
v2 and v3: Changes to the subjects and changelogs.

regards,
dan carpenter

#3 lore raw
Quoted 8 lines · Dan Carpenter
Quoted 4 lines · Julia Lawall

Again, you have three patches on different files with the same subject line. You could add the file name eg rtw_ap: to the subject line to make them unique.

And the subject needs to start with [PATCH v3] and then after the Signed off by line put:

Shouldn't it be only v2 as I haven't sent a v2 for this before.

Regards,
Srishti

Quoted 6 lines

---
v2 and v3: Changes to the subjects and changelogs.

regards,
dan carpenter

#4 lore raw
Quoted 10 lines · Srishti Sharma
Quoted 8 lines · Dan Carpenter
Quoted 4 lines · Julia Lawall

Again, you have three patches on different files with the same subject line. You could add the file name eg rtw_ap: to the subject line to make them unique.

And the subject needs to start with [PATCH v3] and then after the Signed off by line put:

Shouldn't it be only v2 as I haven't sent a v2 for this before.

It should be ok. There was a v1 that only did list_entry and where all the patches had the same subject, but Greg already dropped that one.

julia

Quoted 10 lines

Regards,
Srishti

Quoted 6 lines

---
v2 and v3: Changes to the subjects and changelogs.

regards,
dan carpenter

#5 lore raw
Quoted 11 lines · Julia Lawall
Quoted 7 lines · Srishti Sharma
Quoted 6 lines · Dan Carpenter
Quoted 4 lines · Julia Lawall

Again, you have three patches on different files with the same subject line. You could add the file name eg rtw_ap: to the subject line to make them unique.

Quoted 6 lines
Quoted 3 lines
Quoted 2 lines

And the subject needs to start with [PATCH v3] and then after the Signed off by line put:

Shouldn't it be only v2 as I haven't sent a v2 for this before.

It should be ok. There was a v1 that only did list_entry and where all the patches had the same subject, but Greg already dropped that one.

Yes, I have sent another patch where we only need to convert container_of to list_entry, that is where there is no while loop ,since we now have much less cases of this type , I have sent only one patch for it.

Regards,
Srishti

Quoted 12 lines

julia

Quoted 10 lines

Regards,
Srishti

Quoted 6 lines

---
v2 and v3: Changes to the subjects and changelogs.

regards,
dan carpenter