[PATCH] Staging: rtlwifi: phydm: Use setup_timer

[PATCH] Staging: rtlwifi: phydm: Use setup_timer

[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;
@@

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

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

Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
---
 drivers/staging/rtlwifi/phydm/phydm_interface.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/rtlwifi/phydm/phydm_interface.c b/drivers/staging/rtlwifi/phydm/phydm_interface.c
index 102576a..aa1fb75 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_interface.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_interface.c
@@ -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

Re: [Outreachy kernel] [PATCH] Staging: rtlwifi: phydm: Use setup_timer

[Julia Lawall]

On Sat, 7 Oct 2017, Srishti Sharma wrote:

> 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;
> )
>
> Signed-off-by: Srishti Sharma <srishtishar@gmail.com>

Acked-by: Julia Lawall <julia.lawall@lip6.fr>

> ---
>  drivers/staging/rtlwifi/phydm/phydm_interface.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtlwifi/phydm/phydm_interface.c b/drivers/staging/rtlwifi/phydm/phydm_interface.c
> index 102576a..aa1fb75 100644
> --- a/drivers/staging/rtlwifi/phydm/phydm_interface.c
> +++ b/drivers/staging/rtlwifi/phydm/phydm_interface.c
> @@ -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 outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> 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.
>

Re: [PATCH] Staging: rtlwifi: phydm: Use setup_timer

[Greg KH]

On Sat, Oct 07, 2017 at 10:56:25PM +0530, Srishti Sharma wrote:
> 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;
> )
> 
> Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
>  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