Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1608450 > unrolled thread

[PATCH] aoe: use setup_timer

Back to article view | Back to linux.kernel

Contents

  [PATCH] aoe: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-03-24 15:20 +0100
    [PATCH] ipmi_ssif: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-03-24 15:20 +0100
      Re: [PATCH] ipmi_ssif: use setup_timer Corey Minyard <minyard@acm.org> - 2017-03-25 04:10 +0100
    [PATCH] x86/pci-calgary: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-03-24 15:20 +0100
    Re: [PATCH] aoe: use setup_timer Ed Cashin <ed.cashin@acm.org> - 2017-03-25 20:40 +0100

#1608450 — [PATCH] aoe: use setup_timer

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/block/aoe/aoemain.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index 4b987c2..20865d4 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -28,10 +28,8 @@ discover_timer(ulong vp)
 
 	switch (vp) {
 	case TINIT:
-		init_timer(&t);
+		setup_timer(&t, discover_timer, TRUN);
 		spin_lock_init(&lock);
-		t.data = TRUN;
-		t.function = discover_timer;
 		die = 0;
 	case TRUN:
 		spin_lock_irqsave(&lock, flags);
-- 
2.9.3

[toc] | [next] | [standalone]

#1608451 — [PATCH] ipmi_ssif: use setup_timer

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/char/ipmi/ipmi_ssif.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index cca6e5b..a92a049 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1642,9 +1642,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
 	spin_lock_init(&ssif_info->lock);
 	ssif_info->ssif_state = SSIF_NORMAL;
-	init_timer(&ssif_info->retry_timer);
-	ssif_info->retry_timer.data = (unsigned long) ssif_info;
-	ssif_info->retry_timer.function = retry_timeout;
+	setup_timer(&ssif_info->retry_timer, retry_timeout,
+		    (unsigned long)ssif_info);
 
 	for (i = 0; i < SSIF_NUM_STATS; i++)
 		atomic_set(&ssif_info->stats[i], 0);
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]

#1609073 — Re: [PATCH] ipmi_ssif: use setup_timer

A little nicer, yes.  In queue for the next release.

Thanks,

-corey

On 03/24/2017 09:15 AM, Geliang Tang wrote:
> Use setup_timer() instead of init_timer() to simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
>   drivers/char/ipmi/ipmi_ssif.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
> index cca6e5b..a92a049 100644
> --- a/drivers/char/ipmi/ipmi_ssif.c
> +++ b/drivers/char/ipmi/ipmi_ssif.c
> @@ -1642,9 +1642,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
>   
>   	spin_lock_init(&ssif_info->lock);
>   	ssif_info->ssif_state = SSIF_NORMAL;
> -	init_timer(&ssif_info->retry_timer);
> -	ssif_info->retry_timer.data = (unsigned long) ssif_info;
> -	ssif_info->retry_timer.function = retry_timeout;
> +	setup_timer(&ssif_info->retry_timer, retry_timeout,
> +		    (unsigned long)ssif_info);
>   
>   	for (i = 0; i < SSIF_NUM_STATS; i++)
>   		atomic_set(&ssif_info->stats[i], 0);

[toc] | [prev] | [next] | [standalone]

#1608463 — [PATCH] x86/pci-calgary: use setup_timer

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 arch/x86/kernel/pci-calgary_64.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 0c150c0..fda7867 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -1007,9 +1007,8 @@ static void __init calgary_enable_translation(struct pci_dev *dev)
 	writel(cpu_to_be32(val32), target);
 	readl(target); /* flush */
 
-	init_timer(&tbl->watchdog_timer);
-	tbl->watchdog_timer.function = &calgary_watchdog;
-	tbl->watchdog_timer.data = (unsigned long)dev;
+	setup_timer(&tbl->watchdog_timer, &calgary_watchdog,
+		    (unsigned long)dev);
 	mod_timer(&tbl->watchdog_timer, jiffies);
 }
 
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]

#1609223

On 03/24/2017 10:15 AM, Geliang Tang wrote:
> Use setup_timer() instead of init_timer() to simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
>  drivers/block/aoe/aoemain.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
> index 4b987c2..20865d4 100644
> --- a/drivers/block/aoe/aoemain.c
> +++ b/drivers/block/aoe/aoemain.c
> @@ -28,10 +28,8 @@ discover_timer(ulong vp)
>
>  	switch (vp) {
>  	case TINIT:
> -		init_timer(&t);
> +		setup_timer(&t, discover_timer, TRUN);
>  		spin_lock_init(&lock);
> -		t.data = TRUN;
> -		t.function = discover_timer;
>  		die = 0;
>  	case TRUN:
>  		spin_lock_irqsave(&lock, flags);
>

This change looks OK to me, thanks.

-- 
   Ed

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web