lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sfc: Use mod_timer() to set expiry and add_timer() together

Browse Source 
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Ben Hutchings
2008-05-16 21:13:57 +01:00
committed by Jeff Garzik
parent 071f92d059
commit 4cc58bdebf
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/sfc/boards.c
View File

@@ -27,10 +27,8 @@ static void blink_led_timer(unsigned long context)
struct efx_blinker *bl = &efx->board_info.blinker; struct efx_blinker *bl = &efx->board_info.blinker;
efx->board_info.set_fault_led(efx, bl->state); efx->board_info.set_fault_led(efx, bl->state);
bl->state = !bl->state; bl->state = !bl->state;
if (bl->resubmit) { if (bl->resubmit)
bl->timer.expires = jiffies + BLINK_INTERVAL; mod_timer(&bl->timer, jiffies + BLINK_INTERVAL);
add_timer(&bl->timer);
}
} }
static void board_blink(struct efx_nic *efx, int blink) static void board_blink(struct efx_nic *efx, int blink)
@@ -44,8 +42,7 @@ static void board_blink(struct efx_nic *efx, int blink)
blinker->state = 0; blinker->state = 0;
setup_timer(&blinker->timer, blink_led_timer, setup_timer(&blinker->timer, blink_led_timer,
(unsigned long)efx); (unsigned long)efx);
blinker->timer.expires = jiffies + BLINK_INTERVAL; mod_timer(&blinker->timer, jiffies + BLINK_INTERVAL);
add_timer(&blinker->timer);
} else { } else {
blinker->resubmit = 0; blinker->resubmit = 0;
if (blinker->timer.function) if (blinker->timer.function)