3c59x: Use setup_timer()

PATCH Applied Amitoj Kaur Chawla 3 participants 8 messages Feb 24, 2016 – Feb 29, 2016

Subsystems (3)

Networking Network drivers 3C59X network driver

lore

Share & tools

lore

Amitoj Kaur Chawla

author

2016-02-24 13:58 UTC #0 lore raw

PATCH 3/3 3c59x: Use setup_timer()

Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer.

The Coccinelle semantic patch that fixes this problem is as follows:

// <smpl>
@@
expression t,f,d;
@@

-init_timer(&t);
+setup_timer(&t,f,d);
...
-t.data = d;
-t.function = f;
// </smpl>

Signed-off-by Amitoj Kaur Chawla <[email protected]>

---
 drivers/net/ethernet/3com/3c59x.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

drivers/net/ethernet/3com/3c59x.c +2 -8

index 79e1a02..c377607 100644
@@ -1601,15 +1601,9 @@ vortex_up(struct net_device *dev)
 				dev->name, media_tbl[dev->if_port].name);
 	}
 
-	init_timer(&vp->timer);
+	setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);
 	vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
-	vp->timer.data = (unsigned long)dev;
-	vp->timer.function = vortex_timer;		/* timer handler */
-	add_timer(&vp->timer);
-
-	init_timer(&vp->rx_oom_timer);
-	vp->rx_oom_timer.data = (unsigned long)dev;
-	vp->rx_oom_timer.function = rx_oom_timer;
+	setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
 
 	if (vortex_debug > 1)
 		pr_debug("%s: Initial media type %s.\n",

Signature · 1 line

1.9.1

David Miller

maintainer Applied

2016-02-25 21:52 UTC #1 lore raw

From: Amitoj Kaur Chawla <[email protected]>
Date: Wed, 24 Feb 2016 19:28:19 +0530

Quoted 18 lines

Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer.
The Coccinelle semantic patch that fixes this problem is as follows:
// <smpl>
@@
expression t,f,d;
@@
(quoted diff) +1 -3
-init_timer(&t);
+setup_timer(&t,f,d);
...
-t.data = d;
-t.function = f;
// </smpl>

Quoted 1 line

Signed-off-by Amitoj Kaur Chawla <[email protected]>

Applied.

Stafford Horne

2016-02-27 18:48 UTC #2 lore raw

Quoted 21 lines · David Miller

From: Amitoj Kaur Chawla <[email protected]>
Date: Wed, 24 Feb 2016 19:28:19 +0530
Quoted 18 lines
Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer.
The Coccinelle semantic patch that fixes this problem is as follows:
// <smpl>
@@
expression t,f,d;
@@
(quoted diff) +1 -3
-init_timer(&t);
+setup_timer(&t,f,d);
...
-t.data = d;
-t.function = f;
// </smpl>

Quoted 3 lines

Quoted 1 line
Signed-off-by Amitoj Kaur Chawla <[email protected]>
Applied.

Hi David, Amitoj,

The patch here seemed to remove the call to add_timer(&vp->timer) which applies the expires time. Would that be an issue?

-Stafford

Amitoj Kaur Chawla

author

2016-02-28 07:05 UTC #3 lore raw

Quoted 31 lines · Stafford Horne

Quoted 21 lines · David Miller
From: Amitoj Kaur Chawla <[email protected]>
Date: Wed, 24 Feb 2016 19:28:19 +0530
Quoted 18 lines
Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer.
The Coccinelle semantic patch that fixes this problem is as follows:
// <smpl>
@@
expression t,f,d;
@@
(quoted diff) +1 -3
-init_timer(&t);
+setup_timer(&t,f,d);
...
-t.data = d;
-t.function = f;
// </smpl>
Quoted 4 lines
Quoted 1 line
Signed-off-by Amitoj Kaur Chawla <[email protected]>
Applied.

Quoted 6 lines

Hi David, Amitoj,
The patch here seemed to remove the call to add_timer(&vp->timer) which applies the expires time. Would that be an issue?
-Stafford

I'm sorry. This is my mistake. How can I rectify it now that the patch is applied?

Should I send a patch adding it back?

Amitoj

Stafford Horne

2016-02-28 07:50 UTC #4 lore raw

PATCH 1/1 3c59x: Ensure to apply the expires time

In commit 5b6490def9168af6a ("3c59x: Use setup_timer()") Amitoj removed add_timer which sets up the epires timer. In this patch the behavior is restore but it uses mod_timer which is a bit more compact.

Signed-off-by Stafford Horne <[email protected]>

---

I think a patch like this will help restore the behavior. Also, its small cleanup since we dont need to do separate set to expire and call to add_timer. But thats a style preference.

 drivers/net/ethernet/3com/3c59x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/net/ethernet/3com/3c59x.c +1 -1

index c377607..7b881ed 100644
@@ -1602,7 +1602,7 @@ vortex_up(struct net_device *dev)
 	}
 
 	setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);
-	vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
+	mod_timer(&vp->timer, RUN_AT(media_tbl[dev->if_port].wait));
 	setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
 
 	if (vortex_debug > 1)

Signature · 1 line

2.5.0

David Miller

maintainer Applied

2016-02-29 04:40 UTC #5 lore raw

Re: [PATCH] 3c59x: Ensure to apply the expires time

From: Stafford Horne <[email protected]>
Date: Sun, 28 Feb 2016 16:49:29 +0900

Quoted 6 lines

In commit 5b6490def9168af6a ("3c59x: Use setup_timer()") Amitoj removed add_timer which sets up the epires timer. In this patch the behavior is restore but it uses mod_timer which is a bit more compact.
Signed-off-by Stafford Horne <[email protected]>

Applied, thanks.

Stafford Horne

2016-02-28 07:53 UTC #6 lore raw

In reply to Amitoj Kaur Chawla

Quoted 37 lines · Amitoj Kaur Chawla

Quoted 36 lines · Stafford Horne
Quoted 21 lines · David Miller
From: Amitoj Kaur Chawla <[email protected]>
Date: Wed, 24 Feb 2016 19:28:19 +0530
Quoted 18 lines
Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer.
The Coccinelle semantic patch that fixes this problem is as follows:
// <smpl>
@@
expression t,f,d;
@@
(quoted diff) +1 -3
-init_timer(&t);
+setup_timer(&t,f,d);
...
-t.data = d;
-t.function = f;
// </smpl>
Quoted 4 lines
Quoted 1 line
Signed-off-by Amitoj Kaur Chawla <[email protected]>
Applied.
Hi David, Amitoj,
The patch here seemed to remove the call to add_timer(&vp->timer) which applies the expires time. Would that be an issue?

Quoted 6 lines

Quoted 1 line
-Stafford
I'm sorry. This is my mistake. How can I rectify it now that the patch is applied?
Should I send a patch adding it back?

I sent a patch just now which could help to restore the behavior.

This is applied on top of your patch which I pulled from Dave's tree here:

git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

-Stafford

Amitoj Kaur Chawla

author

2016-02-28 08:13 UTC #7 lore raw

Quoted 49 lines · Stafford Horne

Quoted 37 lines · Amitoj Kaur Chawla
Quoted 36 lines · Stafford Horne
Quoted 21 lines · David Miller
From: Amitoj Kaur Chawla <[email protected]>
Date: Wed, 24 Feb 2016 19:28:19 +0530
Quoted 18 lines
Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer.
The Coccinelle semantic patch that fixes this problem is as follows:
// <smpl>
@@
expression t,f,d;
@@
(quoted diff) +1 -3
-init_timer(&t);
+setup_timer(&t,f,d);
...
-t.data = d;
-t.function = f;
// </smpl>
Quoted 4 lines
Quoted 1 line
Signed-off-by Amitoj Kaur Chawla <[email protected]>
Applied.
Hi David, Amitoj,
The patch here seemed to remove the call to add_timer(&vp->timer) which applies the expires time. Would that be an issue?
Quoted 6 lines
Quoted 1 line
-Stafford
I'm sorry. This is my mistake. How can I rectify it now that the patch is applied?
Should I send a patch adding it back?

Quoted 8 lines

I sent a patch just now which could help to restore the behavior.
This is applied on top of your patch which I pulled from Dave's tree here:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
-Stafford

Thanks!

Amitoj