summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/host.h
diff options
context:
space:
mode:
authorEdmund Nadolski <edmund.nadolski@intel.com>2011-05-19 11:59:56 +0000
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:49 -0700
commit6cb5853d3e252015eaf72d3761491e3da959556d (patch)
treee62addf161577f80ed350ef5478a2f9d558a2a48 /drivers/scsi/isci/host.h
parent0473661a125905240879456567e117ed8a58cf5d (diff)
downloadlinux-6cb5853d3e252015eaf72d3761491e3da959556d.tar.bz2
isci: convert scic_timeout_timer to sci_timer
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.h')
-rw-r--r--drivers/scsi/isci/host.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 2be935fa6af2..80808661ce5c 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -137,10 +137,9 @@ struct scic_sds_controller {
struct sci_base_state_machine state_machine;
/**
- * This field is the driver timer object handler used to time the controller
- * object start and stop requests.
+ * Timer for controller start/stop operations.
*/
- void *timeout_timer;
+ struct sci_timer timer;
/**
* This field contains the user parameters to be utilized for this