diff options
| author | Andreas Herrmann <aherrman@de.ibm.com> | 2006-09-18 22:29:56 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-09-23 18:01:23 -0500 |
| commit | 2abbe866c8eb0296e3f5343bcf73e5371522a738 (patch) | |
| tree | c839b12b43d07d538e32bcabec1fefa2106f384f /drivers/s390/scsi/zfcp_aux.c | |
| parent | 4eff4a36516d72e4f6ede901141214a7e05607e7 (diff) | |
| download | linux-2abbe866c8eb0296e3f5343bcf73e5371522a738.tar.gz linux-2abbe866c8eb0296e3f5343bcf73e5371522a738.tar.bz2 linux-2abbe866c8eb0296e3f5343bcf73e5371522a738.zip | |
[SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
This instance will be used whenever a timer is needed for
a request by zfcp.
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_aux.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_aux.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 504c9219961c..5d39b2df0cc4 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -1135,9 +1135,6 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device) /* initialize lock of associated request queue */ rwlock_init(&adapter->request_queue.queue_lock); - /* intitialise SCSI ER timer */ - init_timer(&adapter->scsi_er_timer); - /* mark adapter unusable as long as sysfs registration is not complete */ atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status); @@ -1653,7 +1650,6 @@ zfcp_ns_gid_pn_request(struct zfcp_erp_action *erp_action) gid_pn->ct.handler = zfcp_ns_gid_pn_handler; gid_pn->ct.handler_data = (unsigned long) gid_pn; gid_pn->ct.timeout = ZFCP_NS_GID_PN_TIMEOUT; - gid_pn->ct.timer = &erp_action->timer; gid_pn->port = erp_action->port; ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.fsf_req_erp, |