Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c579bc76 authored by Kyle Moffett's avatar Kyle Moffett Committed by Benjamin Herrenschmidt
Browse files

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: default avatarKyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent e62b7601

arch/powerpc/sysdev/mpic.c

+1 −6
Original line number Diff line number Diff line
@@ -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)) {