diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-03-28 09:21:04 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:00:37 -0700 |
| commit | ca841f0e862bccd61f537b76c94579c1bd391448 (patch) | |
| tree | f2330231b556b6c1767bf83a0e3f6675acd4d787 /drivers/scsi/isci/host.c | |
| parent | bc99aa47108e9fd759071d4741c7abdf7b903579 (diff) | |
isci: remove base_controller abstraction
Merge struct sci_base_controller into scic_sds_controller, and also factor
the two types of state machine handlers into one function. While we're at
it also remove lots of duplicate incorrect kerneldoc comments for the state
machine handlers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.c')
| -rw-r--r-- | drivers/scsi/isci/host.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index 66449593aa8..adfc2452d21 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c @@ -62,6 +62,7 @@ #include "request.h" #include "host.h" #include "probe_roms.h" +#include "core/scic_sds_controller.h" irqreturn_t isci_msix_isr(int vec, void *data) { @@ -231,9 +232,8 @@ static int isci_host_mdl_allocate_coherent( struct coherent_memory_info *mdl_struct; u32 size = 0; - struct sci_base_memory_descriptor_list *mdl_handle - = sci_controller_get_memory_descriptor_list_handle( - isci_host->core_controller); + struct sci_base_memory_descriptor_list *mdl_handle = + &isci_host->core_controller->mdl; sci_mdl_first_entry(mdl_handle); |