aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/host.h
diff options
context:
space:
mode:
authorEdmund Nadolski <edmund.nadolski@intel.com>2011-05-19 20:00:51 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:49 -0700
commitac0eeb4f774261d1da21a68169f7ddd4f6c082fc (patch)
tree28953f87b323fdc73f00642115910aab619e0150 /drivers/scsi/isci/host.h
parent5553ba2be0f3e3741e1a885a33d2b89921f9fd48 (diff)
isci: convert port config agent timer to sci_timer
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com> [squashed collateral cleanups] 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, 1 insertions, 10 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 784e1355e8e..deb0ee031f2 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -122,7 +122,7 @@ struct scic_sds_port_configuration_agent {
bool timer_pending;
port_config_fn link_up_handler;
port_config_fn link_down_handler;
- void *timer;
+ struct sci_timer timer;
};
/**
@@ -569,15 +569,6 @@ static inline struct isci_host *scic_to_ihost(struct scic_sds_controller *scic)
}
/**
- * scic_sds_controller_get_port_configuration_agent() -
- *
- * This is a helper macro to get the port configuration agent from the
- * controller object.
- */
-#define scic_sds_controller_get_port_configuration_agent(controller) \
- (&(controller)->port_agent)
-
-/**
* scic_sds_controller_get_protocol_engine_group() -
*
* This macro returns the protocol engine group for this controller object.