The patch titled
sfc: use mod_timer() to set expiry and add_timer() together
has been removed from the -mm tree. Its filename was
sfc-use-mod_timer-to-set-expiry-and-add_timer-together.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sfc: use mod_timer() to set expiry and add_timer() together
From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/sfc/boards.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff -puN drivers/net/sfc/boards.c~sfc-use-mod_timer-to-set-expiry-and-add_timer-together drivers/net/sfc/boards.c
--- a/drivers/net/sfc/boards.c~sfc-use-mod_timer-to-set-expiry-and-add_timer-together
+++ a/drivers/net/sfc/boards.c
@@ -27,10 +27,8 @@ static void blink_led_timer(unsigned lon
struct efx_blinker *bl = &efx->board_info.blinker;
efx->board_info.set_fault_led(efx, bl->state);
bl->state = !bl->state;
- if (bl->resubmit) {
- bl->timer.expires = jiffies + BLINK_INTERVAL;
- add_timer(&bl->timer);
- }
+ if (bl->resubmit)
+ mod_timer(&bl->timer, jiffies + BLINK_INTERVAL);
}
static void board_blink(struct efx_nic *efx, int blink)
@@ -44,8 +42,7 @@ static void board_blink(struct efx_nic *
blinker->state = 0;
setup_timer(&blinker->timer, blink_led_timer,
(unsigned long)efx);
- blinker->timer.expires = jiffies + BLINK_INTERVAL;
- add_timer(&blinker->timer);
+ mod_timer(&blinker->timer, jiffies + BLINK_INTERVAL);
} else {
blinker->resubmit = 0;
if (blinker->timer.function)
_
Patches currently in -mm which might be from bhutchings@xxxxxxxxxxxxxx are
git-net.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
