| Message ID | 1419604558-29743-7-git-send-email-Julia.Lawall@lip6.fr |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Julia Lawall <Julia.Lawall@lip6.fr> writes: > Convert a call to init_timer and accompanying intializations of > the timer's data and function fields to a call to setup_timer. > > A simplified version of the semantic match that fixes this problem is as > follows: (http://coccinelle.lip6.fr/) > > // <smpl> > @@ > expression t,f,d; > @@ > > -init_timer(&t); > +setup_timer(&t,f,d); > -t.data = d; > -t.function = f; > // </smpl> > > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Thanks, I applied the wireless-drivers patches below to wireless-drivers-next.git. e4a1c3f88e65 mwifiex: 11n_rxreorder: Use setup_timer c6c33e772407 mwifiex: main: Use setup_timer 99a1b74395a5 orinoco_usb: Use setup_timer 1a94ace406ad iwl3945: Use setup_timer af68b87f7211 iwl4965: Use setup_timer 0be01bf29721 cw1200: queue: Use setup_timer dabefea6937d cw1200: main: Use setup_timer 983988ec0a24 wireless: cw1200: Use setup_timer
diff --git a/drivers/net/wireless/cw1200/pm.c b/drivers/net/wireless/cw1200/pm.c index 6907c8f..d2202ae 100644 --- a/drivers/net/wireless/cw1200/pm.c +++ b/drivers/net/wireless/cw1200/pm.c @@ -101,9 +101,8 @@ int cw1200_pm_init(struct cw1200_pm_state *pm, { spin_lock_init(&pm->lock); - init_timer(&pm->stay_awake); - pm->stay_awake.data = (unsigned long)pm; - pm->stay_awake.function = cw1200_pm_stay_awake_tmo; + setup_timer(&pm->stay_awake, cw1200_pm_stay_awake_tmo, + (unsigned long)pm); return 0; }
Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer. A simplified version of the semantic match that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression t,f,d; @@ -init_timer(&t); +setup_timer(&t,f,d); -t.data = d; -t.function = f; // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- drivers/net/wireless/cw1200/pm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html