openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

firewire: Only use INIT_DELAYED_WORK for first initialization. 

Use PREPARE_DELAYED_WORK to just change the function pointer.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Kristian Høgsberg 2007-03-07 12:12:40 -05:00 committed by Stefan Richter
parent 5f48047756
commit 1da0c93b31
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firewire/fw-sbp2.c
View File

@ -1,5 +1,5 @@
/* -*- c-basic-offset: 8 -*- /* -*- c-basic-offset: 8 -*-
* fw-sbp2.c -- SBP2 driver (SCSI over IEEE1394) * fw-spb2.c -- SBP2 driver (SCSI over IEEE1394)
* *
* Copyright (C) 2005-2007 Kristian Hoegsberg <krh@bitplanet.net> * Copyright (C) 2005-2007 Kristian Hoegsberg <krh@bitplanet.net>
* *
@ -577,7 +577,7 @@ static void sbp2_login(struct work_struct *work)
sbp2_set_busy_timeout(scsi_id); sbp2_set_busy_timeout(scsi_id);
#endif #endif
INIT_DELAYED_WORK(&sd->work, sbp2_reconnect); PREPARE_DELAYED_WORK(&sd->work, sbp2_reconnect);
sbp2_agent_reset(unit); sbp2_agent_reset(unit);
retval = add_scsi_devices(unit); retval = add_scsi_devices(unit);
@ -587,7 +587,7 @@ static void sbp2_login(struct work_struct *work)
NULL); NULL);
/* Set this back to sbp2_login so we fall back and /* Set this back to sbp2_login so we fall back and
* retry login on bus reset. */ * retry login on bus reset. */
INIT_DELAYED_WORK(&sd->work, sbp2_login); PREPARE_DELAYED_WORK(&sd->work, sbp2_login);
} }
} }
@ -714,7 +714,7 @@ static void sbp2_reconnect(struct work_struct *work)
unit->device.bus_id); unit->device.bus_id);
/* Fall back and try to log in again. */ /* Fall back and try to log in again. */
sd->retries = 0; sd->retries = 0;
INIT_DELAYED_WORK(&sd->work, sbp2_login); PREPARE_DELAYED_WORK(&sd->work, sbp2_login);
} }
schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5)); schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5));
return; return;