leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/mpic: Put "pic-no-reset" test back into the MPIC code

Browse Source 
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 <Kyle.D.Moffett@boeing.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Kyle Moffett 2011-12-02 06:28:05 +00:00 committed by Benjamin Herrenschmidt
parent e62b760179
commit c579bc766a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/sysdev/mpic.c
View File

@ -1118,11 +1118,6 @@ static struct irq_host_ops mpic_host_ops = {
.xlate = mpic_host_xlate, .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 * 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 /* When using a device-node, reset requests are only honored if the MPIC
* is allowed to reset. * is allowed to reset.
*/ */
if (mpic_reset_prohibited(node)) if (of_get_property(node, "pic-no-reset", NULL))
mpic->flags |= MPIC_NO_RESET; mpic->flags |= MPIC_NO_RESET;
if ((flags & MPIC_WANTS_RESET) && !(mpic->flags & MPIC_NO_RESET)) { if ((flags & MPIC_WANTS_RESET) && !(mpic->flags & MPIC_NO_RESET)) {