diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-02-18 18:25:05 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 12:55:27 +0200 |
| commit | c7ef4031f01301298bbaba2666740183cd399f8c (patch) | |
| tree | 48f5508280b6a3032e52804dfde1c4b117d6bd3a /drivers/scsi/isci/init.c | |
| parent | isci: remove SCIC_DEBUG_ENABLED, and fixup an odd macro (diff) | |
| download | linux-c7ef4031f01301298bbaba2666740183cd399f8c.tar.xz linux-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/init.c')
| -rw-r--r-- | drivers/scsi/isci/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index e3d9b15d0cbf..f2bd92b81136 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -334,7 +334,7 @@ static int isci_setup_interrupts(struct pci_dev *pdev) BUG_ON(!isci_host); /* @todo: need to handle error case. */ - err = devm_request_irq(&pdev->dev, msix->vector, isci_isr, 0, + err = devm_request_irq(&pdev->dev, msix->vector, isci_msix_isr, 0, DRV_NAME"-msix", isci_host); if (!err) continue; @@ -353,7 +353,7 @@ static int isci_setup_interrupts(struct pci_dev *pdev) return 0; intx: - err = devm_request_irq(&pdev->dev, pdev->irq, isci_legacy_isr, + err = devm_request_irq(&pdev->dev, pdev->irq, isci_intx_isr, IRQF_SHARED, DRV_NAME"-intx", pdev); return err; |