[PATCH] powerpc: pseries: use irq_of_parse_and_map helper

[Rob Herring]

Instead of calling both of_irq_parse_one and irq_create_of_mapping, call
of_irq_parse_and_map instead which does the same thing. This gets us closer
to making the former 2 functions static.

Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: linuxppc-...@lists.ozlabs.org
Signed-off-by: Rob Herring <r...@kernel.org>
---
 arch/powerpc/platforms/pseries/event_sources.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/event_sources.c 
b/arch/powerpc/platforms/pseries/event_sources.c
index 6eeb0d4bab61..b0d8c146fe7b 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -16,7 +16,8 @@
  * 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"

@@ -25,15 +26,11 @@ void request_event_sources_irqs(struct device_node *np,
                                const char *name)
 {
        int i, index, count = 0;
-       struct of_phandle_args oirq;
        unsigned int virqs[16];

        /* First try to do a proper OF tree parsing */
-       for (index = 0; of_irq_parse_one(np, index, &oirq) == 0;
-            index++) {
-               if (count > 15)
-                       break;
-               virqs[count] = irq_create_of_mapping(&oirq);
+       for (index = 0; count < 16; index++) {
+               virqs[count] = irq_of_parse_and_map(np, index);
                if (!virqs[count]) {
                        pr_err("event-sources: Unable to allocate "
                               "interrupt number for %pOF\n",
--
2.14.1