FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-06 03:10:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hpsa: rename free_irqs to hpsa_free_irqs

Browse Source 
Change the function names to have hpsa prefix.

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>
This commit is contained in:
Robert Elliott 2015-01-23 16:41:40 -06:00 committed by James Bottomley
parent f2ef0ce712
commit ec501a1863
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/scsi/hpsa.c
View File

@ -6491,6 +6491,25 @@ static void hpsa_irq_affinity_hints(struct ctlr_info *h)
} }
} }
/* clear affinity hints and free MSI-X, MSI, or legacy INTx vectors */
static void hpsa_free_irqs(struct ctlr_info *h)
{
int i;
if (!h->msix_vector || h->intr_mode != PERF_MODE_INT) {
/* Single reply queue, only one irq to free */
i = h->intr_mode;
irq_set_affinity_hint(h->intr[i], NULL);
free_irq(h->intr[i], &h->q[i]);
return;
}
for (i = 0; i < h->msix_vector; i++) {
irq_set_affinity_hint(h->intr[i], NULL);
free_irq(h->intr[i], &h->q[i]);
}
}
static int hpsa_request_irq(struct ctlr_info *h, static int hpsa_request_irq(struct ctlr_info *h,
irqreturn_t (*msixhandler)(int, void *), irqreturn_t (*msixhandler)(int, void *),
irqreturn_t (*intxhandler)(int, void *)) irqreturn_t (*intxhandler)(int, void *))
@ -6555,27 +6574,9 @@ static int hpsa_kdump_soft_reset(struct ctlr_info *h)
return 0; return 0;
} }
static void free_irqs(struct ctlr_info *h)
{
int i;
if (!h->msix_vector || h->intr_mode != PERF_MODE_INT) {
/* Single reply queue, only one irq to free */
i = h->intr_mode;
irq_set_affinity_hint(h->intr[i], NULL);
free_irq(h->intr[i], &h->q[i]);
return;
}
for (i = 0; i < h->msix_vector; i++) {
irq_set_affinity_hint(h->intr[i], NULL);
free_irq(h->intr[i], &h->q[i]);
}
}
static void hpsa_free_irqs_and_disable_msix(struct ctlr_info *h) static void hpsa_free_irqs_and_disable_msix(struct ctlr_info *h)
{ {
free_irqs(h); hpsa_free_irqs(h);
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
if (h->msix_vector) { if (h->msix_vector) {
if (h->pdev->msix_enabled) if (h->pdev->msix_enabled)
@ -6937,7 +6938,7 @@ reinit_after_soft_reset:
spin_lock_irqsave(&h->lock, flags); spin_lock_irqsave(&h->lock, flags);
h->access.set_intr_mask(h, HPSA_INTR_OFF); h->access.set_intr_mask(h, HPSA_INTR_OFF);
spin_unlock_irqrestore(&h->lock, flags); spin_unlock_irqrestore(&h->lock, flags);
free_irqs(h); hpsa_free_irqs(h);
rc = hpsa_request_irq(h, hpsa_msix_discard_completions, rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
hpsa_intx_discard_completions); hpsa_intx_discard_completions);
if (rc) { if (rc) {
@ -6997,7 +6998,7 @@ reinit_after_soft_reset:
clean4: clean4:
hpsa_free_sg_chain_blocks(h); hpsa_free_sg_chain_blocks(h);
hpsa_free_cmd_pool(h); hpsa_free_cmd_pool(h);
free_irqs(h); hpsa_free_irqs(h);
clean2: clean2:
clean1: clean1:
if (h->lockup_detected) if (h->lockup_detected)