From: Mark Brown Date: Wed, 10 Oct 2007 10:05:44 +0000 (+0100) Subject: natsemi: Use round_jiffies() for slow timers X-Git-Tag: v2.6.24-rc1~1281^2~34 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0e5d5442cbe3399d789d6a75c6e3a0db37f846f5;p=linux-2.6-omap-h63xx.git natsemi: Use round_jiffies() for slow timers Unless we have failed to fill the RX ring the timer used by the natsemi driver is not particularly urgent and can use round_jiffies() to allow grouping with other timers. Signed-off-by: Mark Brown Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 527f9dcc7f6..b881786eebd 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -1576,7 +1576,7 @@ static int netdev_open(struct net_device *dev) /* Set the timer to check for link beat. */ init_timer(&np->timer); - np->timer.expires = jiffies + NATSEMI_TIMER_FREQ; + np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ); np->timer.data = (unsigned long)dev; np->timer.function = &netdev_timer; /* timer handler */ add_timer(&np->timer); @@ -1856,7 +1856,11 @@ static void netdev_timer(unsigned long data) next_tick = 1; } } - mod_timer(&np->timer, jiffies + next_tick); + + if (next_tick > 1) + mod_timer(&np->timer, round_jiffies(jiffies + next_tick)); + else + mod_timer(&np->timer, jiffies + next_tick); } static void dump_ring(struct net_device *dev) @@ -3331,7 +3335,7 @@ static int natsemi_resume (struct pci_dev *pdev) spin_unlock_irq(&np->lock); enable_irq(dev->irq); - mod_timer(&np->timer, jiffies + 1*HZ); + mod_timer(&np->timer, round_jiffies(jiffies + 1*HZ)); } netif_device_attach(dev); out: