From: Kyle Moffett Date: Fri, 2 Dec 2011 06:28:05 +0000 (+0000) Subject: powerpc/mpic: Put "pic-no-reset" test back into the MPIC code X-Git-Tag: v3.12-rc1~4159^2~50^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c579bc766a84a57c31d7b41276ffa9545a34ee1b;p=kernel%2Fkernel-generic.git powerpc/mpic: Put "pic-no-reset" test back into the MPIC code 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 Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 1e7584b..3240bba 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)) {