diff options
| author |   Robert Elliott <elliott@hp.com> | 2015-01-23 16:42:32 -0600 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2015-02-02 09:57:38 -0800 |
| commit | 9ee61794879dad68ec273f3e4eaad41285e6ff3c (patch) | |
| tree | 5b570f1eaad7d062741fa4bca9015d03de350b52 /drivers/scsi/hpsa.c | |
| parent | hpsa: report failure to ioremap config table (diff) | |
| download | linux-dev-9ee61794879dad68ec273f3e4eaad41285e6ff3c.tar.xz linux-dev-9ee61794879dad68ec273f3e4eaad41285e6ff3c.zip | |
hpsa: rename hpsa_request_irq to hpsa_request_irqs
Make the function name more descriptive. We use more than
one interrupt.
Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 354e7f8831a4..f29f569e0a5b 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -6526,7 +6526,8 @@ static void hpsa_free_irqs(struct ctlr_info *h) h->q[i] = 0; } -static int hpsa_request_irq(struct ctlr_info *h, +/* returns 0 on success; cleans up and returns -Enn on error */ +static int hpsa_request_irqs(struct ctlr_info *h, irqreturn_t (*msixhandler)(int, void *), irqreturn_t (*intxhandler)(int, void *)) { @@ -6934,7 +6935,7 @@ reinit_after_soft_reset: /* make sure the board interrupts are off */ h->access.set_intr_mask(h, HPSA_INTR_OFF); - if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx)) + if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx)) goto clean2; dev_info(&pdev->dev, "%s: <0x%x> at IRQ %d%s using DAC\n", h->devname, pdev->device, @@ -6970,11 +6971,11 @@ reinit_after_soft_reset: h->access.set_intr_mask(h, HPSA_INTR_OFF); spin_unlock_irqrestore(&h->lock, flags); hpsa_free_irqs(h); - rc = hpsa_request_irq(h, hpsa_msix_discard_completions, + rc = hpsa_request_irqs(h, hpsa_msix_discard_completions, hpsa_intx_discard_completions); if (rc) { - dev_warn(&h->pdev->dev, "Failed to request_irq after " - "soft reset.\n"); + dev_warn(&h->pdev->dev, + "Failed to request_irq after soft reset.\n"); goto clean4; } |