Commit 5327ef9c authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by David S. Miller
Browse files

net: tulip: 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: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b69d871

drivers/net/ethernet/dec/tulip/tulip_core.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -505,9 +505,7 @@ media_picked: 
	tp->timer.expires = RUN_AT(next_tick);

	tp->timer.expires = RUN_AT(next_tick);

	add_timer(&tp->timer);

	add_timer(&tp->timer);

#ifdef CONFIG_TULIP_NAPI

#ifdef CONFIG_TULIP_NAPI

	init_timer(&tp->oom_timer);

	setup_timer(&tp->oom_timer, oom_timer, (unsigned long)dev);

        tp->oom_timer.data = (unsigned long)dev;

        tp->oom_timer.function = oom_timer;

#endif

#endif

}

}
@@ -782,9 +780,8 @@ static void tulip_down (struct net_device *dev) 




	spin_unlock_irqrestore (&tp->lock, flags);

	spin_unlock_irqrestore (&tp->lock, flags);





	init_timer(&tp->timer);

	setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer,

	tp->timer.data = (unsigned long)dev;

		    (unsigned long)dev);

	tp->timer.function = tulip_tbl[tp->chip_id].media_timer;





	dev->if_port = tp->saved_if_port;

	dev->if_port = tp->saved_if_port;
@@ -1475,9 +1472,8 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	tp->csr0 = csr0;

	tp->csr0 = csr0;

	spin_lock_init(&tp->lock);

	spin_lock_init(&tp->lock);

	spin_lock_init(&tp->mii_lock);

	spin_lock_init(&tp->mii_lock);

	init_timer(&tp->timer);

	setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer,

	tp->timer.data = (unsigned long)dev;

		    (unsigned long)dev);

	tp->timer.function = tulip_tbl[tp->chip_id].media_timer;





	INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);

	INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);

CRA Git | Maintained and supported by SUSTech CRA and CCSE