diff options
author | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
commit | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch) | |
tree | 1c4c89652c62a75da09f9b9442012007e4ac6250 /drivers/scsi/ipr.c | |
parent | 65f27f38446e1976cc98fd3004b110fedcddd189 (diff) |
WorkStruct: make allyesconfig
Fix up for make allyesconfig.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r-- | drivers/scsi/ipr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 2dde821025f3..d51c3e764bb0 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -2093,7 +2093,7 @@ static void ipr_release_dump(struct kref *kref) | |||
2093 | 2093 | ||
2094 | /** | 2094 | /** |
2095 | * ipr_worker_thread - Worker thread | 2095 | * ipr_worker_thread - Worker thread |
2096 | * @data: ioa config struct | 2096 | * @work: ioa config struct |
2097 | * | 2097 | * |
2098 | * Called at task level from a work thread. This function takes care | 2098 | * Called at task level from a work thread. This function takes care |
2099 | * of adding and removing device from the mid-layer as configuration | 2099 | * of adding and removing device from the mid-layer as configuration |
@@ -2102,13 +2102,14 @@ static void ipr_release_dump(struct kref *kref) | |||
2102 | * Return value: | 2102 | * Return value: |
2103 | * nothing | 2103 | * nothing |
2104 | **/ | 2104 | **/ |
2105 | static void ipr_worker_thread(void *data) | 2105 | static void ipr_worker_thread(struct work_struct *work) |
2106 | { | 2106 | { |
2107 | unsigned long lock_flags; | 2107 | unsigned long lock_flags; |
2108 | struct ipr_resource_entry *res; | 2108 | struct ipr_resource_entry *res; |
2109 | struct scsi_device *sdev; | 2109 | struct scsi_device *sdev; |
2110 | struct ipr_dump *dump; | 2110 | struct ipr_dump *dump; |
2111 | struct ipr_ioa_cfg *ioa_cfg = data; | 2111 | struct ipr_ioa_cfg *ioa_cfg = |
2112 | container_of(work, struct ipr_ioa_cfg, work_q); | ||
2112 | u8 bus, target, lun; | 2113 | u8 bus, target, lun; |
2113 | int did_work; | 2114 | int did_work; |
2114 | 2115 | ||
@@ -6926,7 +6927,7 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg, | |||
6926 | INIT_LIST_HEAD(&ioa_cfg->hostrcb_pending_q); | 6927 | INIT_LIST_HEAD(&ioa_cfg->hostrcb_pending_q); |
6927 | INIT_LIST_HEAD(&ioa_cfg->free_res_q); | 6928 | INIT_LIST_HEAD(&ioa_cfg->free_res_q); |
6928 | INIT_LIST_HEAD(&ioa_cfg->used_res_q); | 6929 | INIT_LIST_HEAD(&ioa_cfg->used_res_q); |
6929 | INIT_WORK(&ioa_cfg->work_q, ipr_worker_thread, ioa_cfg); | 6930 | INIT_WORK(&ioa_cfg->work_q, ipr_worker_thread); |
6930 | init_waitqueue_head(&ioa_cfg->reset_wait_q); | 6931 | init_waitqueue_head(&ioa_cfg->reset_wait_q); |
6931 | ioa_cfg->sdt_state = INACTIVE; | 6932 | ioa_cfg->sdt_state = INACTIVE; |
6932 | if (ipr_enable_cache) | 6933 | if (ipr_enable_cache) |