Skip to content

Commit

Permalink
powerpc/xics: Cleanup xics_host_map and ipi
Browse files Browse the repository at this point in the history
Since we already have a special case in map to set the ipi handler, use
the desired flow.

If we don't find an ics to handle the interrupt complain instead of
returning 0 without having set a chip or handler.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Milton Miller authored and Benjamin Herrenschmidt committed May 19, 2011
1 parent 7145427 commit e085255
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/powerpc/sysdev/xics/xics-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,8 @@ static void xics_request_ipi(void)

/*
* IPIs are marked IRQF_DISABLED as they must run with irqs
* disabled
* disabled, and PERCPU. The handler was set in map.
*/
irq_set_handler(ipi, handle_percpu_irq);
BUG_ON(request_irq(ipi, icp_ops->ipi_action,
IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL));
}
Expand Down Expand Up @@ -341,15 +340,16 @@ static int xics_host_map(struct irq_host *h, unsigned int virq,
/* Don't call into ICS for IPIs */
if (hw == XICS_IPI) {
irq_set_chip_and_handler(virq, &xics_ipi_chip,
handle_fasteoi_irq);
handle_percpu_irq);
return 0;
}

/* Let the ICS setup the chip data */
list_for_each_entry(ics, &ics_list, link)
if (ics->map(ics, virq) == 0)
break;
return 0;
return 0;

return -EINVAL;
}

static int xics_host_xlate(struct irq_host *h, struct device_node *ct,
Expand Down

0 comments on commit e085255

Please sign in to comment.