diff options
| author |   Kristian Høgsberg <krh@redhat.com> | 2007-03-07 12:12:40 -0500 |
|---|---|---|
| committer |   Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 22:03:07 +0100 |
| commit | 1da0c93b31bb8f374a22f4e20dab02fd79f6c7e6 (patch) | |
| tree | 486a3e07f08f2e969d43a3f3993130e1149ec40e /drivers/firewire/fw-sbp2.c | |
| parent | firewire: Iterate through units in a keventd callback for update callbacks. (diff) | |
| download | linux-dev-1da0c93b31bb8f374a22f4e20dab02fd79f6c7e6.tar.xz linux-dev-1da0c93b31bb8f374a22f4e20dab02fd79f6c7e6.zip | |
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>
Diffstat (limited to 'drivers/firewire/fw-sbp2.c')
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 2259e2225866..994914f89b55 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c @@ -1,5 +1,5 @@ /* -*- 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> * @@ -577,7 +577,7 @@ static void sbp2_login(struct work_struct *work) sbp2_set_busy_timeout(scsi_id); #endif - INIT_DELAYED_WORK(&sd->work, sbp2_reconnect); + PREPARE_DELAYED_WORK(&sd->work, sbp2_reconnect); sbp2_agent_reset(unit); retval = add_scsi_devices(unit); @@ -587,7 +587,7 @@ static void sbp2_login(struct work_struct *work) NULL); /* Set this back to sbp2_login so we fall back and * 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); /* Fall back and try to log in again. */ 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)); return; |