summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorYi Zou <yi.zou@intel.com>2012-01-13 17:26:30 -0800
committerJames Bottomley <JBottomley@Parallels.com>2012-01-16 12:47:18 +0400
commit76ffe8a3f766358a0ade543153625b3e4e66159d (patch)
tree003d5be7447e0a4ac75b00c890f75c3cd406b3e7 /drivers/scsi
parent7c9c684160bc2c6668abbd2701b440e18bb9ef35 (diff)
downloadop-kernel-dev-76ffe8a3f766358a0ade543153625b3e4e66159d.zip
op-kernel-dev-76ffe8a3f766358a0ade543153625b3e4e66159d.tar.gz
[SCSI] libfc: remove redundant timer init for fcp
The fcp timer is already initialized when it gets allocated. Signed-off-by: Yi Zou <yi.zou@intel.com> Tested-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libfc/fc_fcp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 221875e..f607314 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -155,6 +155,7 @@ static struct fc_fcp_pkt *fc_fcp_pkt_alloc(struct fc_lport *lport, gfp_t gfp)
fsp->xfer_ddp = FC_XID_UNKNOWN;
atomic_set(&fsp->ref_cnt, 1);
init_timer(&fsp->timer);
+ fsp->timer.data = (unsigned long)fsp;
INIT_LIST_HEAD(&fsp->list);
spin_lock_init(&fsp->scsi_pkt_lock);
}
@@ -1850,9 +1851,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
}
put_cpu();
- init_timer(&fsp->timer);
- fsp->timer.data = (unsigned long)fsp;
-
/*
* send it to the lower layer
* if we get -1 return then put the request in the pending
OpenPOWER on IntegriCloud