mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 09:09:23 +00:00
Code Issues Releases Wiki Activity

powerpc/pseries: Use of_irq_get helper() in request_event_sources_irqs()

Browse source 
Instead of calling both of_irq_parse_one() and
irq_create_of_mapping(), call of_irq_get() instead which does
essentially the same thing. of_irq_get() also calls irq_find_host()
for deferred probe support, but this should be fine as
irq_create_of_mapping() also calls that internally. This gets us
closer to making the former 2 functions static.

In the process of simplifying request_event_sources_irqs(), combine
the the pr_err() and WARN_ON() calls to just a WARN().

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Rob Herring 2018-02-01 11:59:22 -06:00 committed by Michael Ellerman
parent 8c8933eba0
commit c417596d24
1 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
arch/powerpc/platforms/pseries/event_sources.c
View file

@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <asm/prom.h> #include <linux/interrupt.h>
#include <linux/of_irq.h>
#include "pseries.h" #include "pseries.h"
@ -24,34 +25,19 @@ void request_event_sources_irqs(struct device_node *np,
irq_handler_t handler, irq_handler_t handler,
const char *name) const char *name)
{ {
int i, index, count = 0; int i, virq, rc;
struct of_phandle_args oirq;
unsigned int virqs[16];
/* First try to do a proper OF tree parsing */ for (i = 0; i < 16; i++) {
for (index = 0; of_irq_parse_one(np, index, &oirq) == 0; virq = of_irq_get(np, i);
index++) { if (virq < 0)
if (count > 15) return;
break; if (WARN(!virq, "event-sources: Unable to allocate "
virqs[count] = irq_create_of_mapping(&oirq); "interrupt number for %pOF\n", np))
if (!virqs[count]) { continue;
pr_err("event-sources: Unable to allocate "
"interrupt number for %pOF\n", rc = request_irq(virq, handler, 0, name, NULL);
np); if (WARN(rc, "event-sources: Unable to request interrupt %d for %pOF\n",
WARN_ON(1); virq, np))
} else {
count++;
}
}
/* Now request them */
for (i = 0; i < count; i++) {
if (request_irq(virqs[i], handler, 0, name, NULL)) {
pr_err("event-sources: Unable to request interrupt "
"%d for %pOF\n", virqs[i], np);
WARN_ON(1);
return; return;
}
} }
} }