Skip to contentSkip to conversation

Staging: rtlwifi: phydm: Use setup_timer

PATCH In review Srishti Sharma 3 participants 3 messages Oct 7, 2017 – Oct 18, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtlwifi: phydm: Use setup_timer

Use setup_timer to combine initialization of a timer with the initialization of the timer's function and data fields. Done using the following semantic patch by coccinelle.

@r@
struct timer_list *l;
expression f, d;
@@

-init_timer(l);
+setup_timer(l,f,d);
...

(
- l->function = f;
...
- l->data = d;
|
- l->data = d;
...
- l->function = f;
)

---
 drivers/staging/rtlwifi/phydm/phydm_interface.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/rtlwifi/phydm/phydm_interface.c +1 -3
index 102576a..aa1fb75 100644
@@ -189,9 +189,7 @@ void odm_initialize_timer(struct phy_dm_struct *dm, struct timer_list *timer,
 			  void *call_back_func, void *context,
 			  const char *sz_id)
 {
-	init_timer(timer);
-	timer->function = call_back_func;
-	timer->data = (unsigned long)dm;
+	setup_timer(timer, call_back_func, (unsigned long)dm);
 	/*mod_timer(timer, jiffies+RTL_MILISECONDS_TO_JIFFIES(10));	*/
 }
 
Signature · 1 line
2.7.4
Acked-by on v1 1/1
#1 lore raw
Quoted 23 lines · Srishti Sharma

Use setup_timer to combine initialization of a timer with the initialization of the timer's function and data fields. Done using the following semantic patch by coccinelle.

@r@
struct timer_list *l;
expression f, d;
@@

(quoted diff) +1 -1
-init_timer(l);
+setup_timer(l,f,d);
...

(
- l->function = f;
...
- l->data = d;
|
- l->data = d;
...
- l->function = f;
)

Quoted 1 line
Quoted 29 lines
---
 drivers/staging/rtlwifi/phydm/phydm_interface.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/rtlwifi/phydm/phydm_interface.c +1 -4
index 102576a..aa1fb75 100644
@@ -189,9 +189,7 @@ void odm_initialize_timer(struct phy_dm_struct *dm, struct timer_list *timer,
 			  void *call_back_func, void *context,
 			  const char *sz_id)
 {
-	init_timer(timer);
-	timer->function = call_back_func;
-	timer->data = (unsigned long)dm;
+	setup_timer(timer, call_back_func, (unsigned long)dm);
 	/*mod_timer(timer, jiffies+RTL_MILISECONDS_TO_JIFFIES(10));	*/
 }
 
--

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/1507397185-6139-1-git-send-email-srishtishar%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

maintainer
#2 lore raw
In reply to Srishti Sharma
Quoted 23 lines · Srishti Sharma

Use setup_timer to combine initialization of a timer with the initialization of the timer's function and data fields. Done using the following semantic patch by coccinelle.

@r@
struct timer_list *l;
expression f, d;
@@

(quoted diff) +1 -1
-init_timer(l);
+setup_timer(l,f,d);
...

(
- l->function = f;
...
- l->data = d;
|
- l->data = d;
...
- l->function = f;
)

Quoted 5 lines
---
 drivers/staging/rtlwifi/phydm/phydm_interface.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Due to other changes in this same function, this patch no longer applies, sorry.

greg k-h