From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753664AbeADWpu (ORCPT + 1 other); Thu, 4 Jan 2018 17:45:50 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:46181 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753616AbeADWpr (ORCPT ); Thu, 4 Jan 2018 17:45:47 -0500 X-Google-Smtp-Source: ACJfBot7mAKNP15AzATz4WnQb1e5w2wpFtuWk7WNfknBa+177eii/mWW82etu36CBfzm4VGETBDdbQ== From: Rob Herring To: Michael Ellerman Cc: linux-kernel@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc: pseries: use irq_of_parse_and_map helper Date: Thu, 4 Jan 2018 16:45:42 -0600 Message-Id: <20180104224542.15333-4-robh@kernel.org> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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 Cc: Paul Mackerras Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring --- 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 +#include +#include #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