diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-02-18 09:25:05 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 03:55:27 -0700 |
| commit | c7ef4031f01301298bbaba2666740183cd399f8c (patch) | |
| tree | 48f5508280b6a3032e52804dfde1c4b117d6bd3a /drivers/scsi/isci/isci.h | |
| parent | 11c88986290712fc3ae6993af85a0f9a15886278 (diff) | |
isci: bypass scic_controller_get_handler_methods()
The indirection is unecessary and broken in the current case that assigns the
handlers based on a not up-to-date pdev->msix_enabled value.
Route the handlers directly to the requisite core routines.
Todo: hook up error interrupt handling
Reported-by: Jeff Garzik <jeff@garzik.org>
Cc: Christoph Hellwig <hch@infradead.org>
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/isci.h')
| -rw-r--r-- | drivers/scsi/isci/isci.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h index 6aee3c9c8827..3dc0f6c21174 100644 --- a/drivers/scsi/isci/isci.h +++ b/drivers/scsi/isci/isci.h @@ -113,8 +113,11 @@ struct isci_firmware { u8 sas_addrs_size; }; -irqreturn_t isci_isr(int vec, void *data); -irqreturn_t isci_legacy_isr(int vec, void *data); +irqreturn_t isci_msix_isr(int vec, void *data); +irqreturn_t isci_intx_isr(int vec, void *data); + +bool scic_sds_controller_isr(struct scic_sds_controller *scic); +void scic_sds_controller_completion_handler(struct scic_sds_controller *scic); enum sci_status isci_parse_oem_parameters( union scic_oem_parameters *oem_params, |