forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfc: Merge struct efx_blinker into struct efx_board

Browse source 
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2009-10-23 08:31:29 +00:00 • committed by David S. Miller
parent 63f1988419
commit 7d4cdb5af0
2 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/net/sfc/falcon_boards.c
View file

@ -35,30 +35,31 @@
static void blink_led_timer(unsigned long context)
{
struct efx_nic *efx = (struct efx_nic *)context;
struct efx_blinker *bl = &efx->board_info.blinker;
efx->board_info.set_id_led(efx, bl->state);
bl->state = !bl->state;
if (bl->resubmit)
mod_timer(&bl->timer, jiffies + BLINK_INTERVAL);
struct efx_board *board = &efx->board_info;
board->set_id_led(efx, board->blink_state);
board->blink_state = !board->blink_state;
if (board->blink_resubmit)
mod_timer(&board->blink_timer, jiffies + BLINK_INTERVAL);
}
static void board_blink(struct efx_nic *efx, bool blink)
{
struct efx_blinker *blinker = &efx->board_info.blinker;
struct efx_board *board = &efx->board_info;
/* The rtnl mutex serialises all ethtool ioctls, so
* nothing special needs doing here. */
if (blink) {
blinker->resubmit = true;
blinker->state = false;
setup_timer(&blinker->timer, blink_led_timer,
board->blink_resubmit = true;
board->blink_state = false;
setup_timer(&board->blink_timer, blink_led_timer,
(unsigned long)efx);
mod_timer(&blinker->timer, jiffies + BLINK_INTERVAL);
mod_timer(&board->blink_timer, jiffies + BLINK_INTERVAL);
} else {
blinker->resubmit = false;
if (blinker->timer.function)
del_timer_sync(&blinker->timer);
efx->board_info.init_leds(efx);
board->blink_resubmit = false;
if (board->blink_timer.function)
del_timer_sync(&board->blink_timer);
board->init_leds(efx);
}
}