From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from border.exmeritus.com (border.exmeritus.com [IPv6:2002:46a7:f11a:ffff::]) by ozlabs.org (Postfix) with ESMTP id ED0CCB6F7D for ; Wed, 30 Nov 2011 05:59:39 +1100 (EST) From: Kyle Moffett To: Benjamin Herrenschmidt Subject: [PATCH 08/10] powerpc/mpic: Put "pic-no-reset" test back into the MPIC code Date: Tue, 29 Nov 2011 13:58:35 -0500 Message-Id: <1322593117-29938-9-git-send-email-Kyle.D.Moffett@boeing.com> In-Reply-To: <1322593117-29938-1-git-send-email-Kyle.D.Moffett@boeing.com> References: <1322593117-29938-1-git-send-email-Kyle.D.Moffett@boeing.com> Cc: linuxppc-dev , Kyle Moffett List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , There's not really any reason to have this one-liner in a separate static inline function, given that all the other similar tests are already in the alloc_mpic() code. Signed-off-by: Kyle Moffett --- arch/powerpc/sysdev/mpic.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 6916ba5..5b380b8 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1118,11 +1118,6 @@ static struct irq_host_ops mpic_host_ops = { .xlate = mpic_host_xlate, }; -static int mpic_reset_prohibited(struct device_node *node) -{ - return node && of_get_property(node, "pic-no-reset", NULL); -} - /* * Exported functions */ @@ -1272,7 +1267,7 @@ struct mpic * __init mpic_alloc(struct device_node *node, /* When using a device-node, reset requests are only honored if the MPIC * is allowed to reset. */ - if (mpic_reset_prohibited(node)) + if (of_get_property(node, "pic-no-reset", NULL)) mpic->flags |= MPIC_NO_RESET; if ((flags & MPIC_WANTS_RESET) && !(mpic->flags & MPIC_NO_RESET)) { -- 1.7.2.5