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/host.h | |
| parent | 11c88986290712fc3ae6993af85a0f9a15886278 (diff) | |
| download | linux-stable-c7ef4031f01301298bbaba2666740183cd399f8c.tar.gz linux-stable-c7ef4031f01301298bbaba2666740183cd399f8c.tar.bz2 linux-stable-c7ef4031f01301298bbaba2666740183cd399f8c.zip | |
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/host.h')
| -rw-r--r-- | drivers/scsi/isci/host.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index 4f4b99d29589..421d3debdaed 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -53,13 +53,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** - * This file contains the isci_module initialization routines. - * - * host.h - */ - - #if !defined(_SCI_HOST_H_) #define _SCI_HOST_H_ @@ -79,10 +72,6 @@ #define SCI_SCU_BAR_SIZE (4*1024*1024) #define SCI_IO_SPACE_BAR0 2 #define SCI_IO_SPACE_BAR1 3 -#define SCI_MSIX_NORMAL_VECTOR 0 -#define SCI_MSIX_ERROR_VECTOR 1 -#define SCI_MSIX_SINGLE_VECTOR 1 -#define SCI_MSIX_DOUBLE_VECTOR 2 #define ISCI_CAN_QUEUE_VAL 250 /* < SCI_MAX_IO_REQUESTS ? */ #define SCIC_CONTROLLER_STOP_TIMEOUT 5000 @@ -96,7 +85,6 @@ struct coherent_memory_info { struct isci_host { struct scic_sds_controller *core_controller; - struct scic_controller_handler_methods scic_irq_handlers[SCI_NUM_MSI_X_INT]; union scic_oem_parameters oem_parameters; int id; /* unique within a given pci device */ |