summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/host.h
diff options
context:
space:
mode:
authorEdmund Nadolski <edmund.nadolski@intel.com>2011-05-20 05:26:02 +0200
committerDan Williams <dan.j.williams@intel.com>2011-07-03 13:04:49 +0200
commitbb3dbdf6c835a145e46119ed18a920a774694583 (patch)
tree0ce8f5823212a451a705d83008d23c89f363068f /drivers/scsi/isci/host.h
parentisci: convert scic_timeout_timer to sci_timer (diff)
downloadlinux-bb3dbdf6c835a145e46119ed18a920a774694583.tar.xz
linux-bb3dbdf6c835a145e46119ed18a920a774694583.zip
isci: convert phy_startup_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.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 80808661ce5c..9fd47b42da05 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -271,15 +271,14 @@ struct scic_sds_controller {
/* Phy Startup Data */
/**
- * This field is the driver timer handle for controller phy request startup.
- * On controller start the controller will start each PHY individually in
- * order of phy index.
+ * Timer for controller phy request startup. On controller start the
+ * controller will start each PHY individually in order of phy index.
*/
- void *phy_startup_timer;
+ struct sci_timer phy_timer;
/**
- * This field is set when the phy_startup_timer is running and is cleared when
- * the phy_startup_timer is stopped.
+ * This field is set when the phy_timer is running and is cleared when
+ * the phy_timer is stopped.
*/
bool phy_startup_timer_pending;