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

Commit dbecd509 authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman
Browse files

powerpc/kernel: Remove nested if statements in rtas_initialize() 



This removes the unnecessary nested if statements in function
rtas_initialize(), to simplify the code. No functional changes
introduced.

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent fb37e128

arch/powerpc/kernel/rtas.c

+16 −17
Original line number Diff line number Diff line
@@ -1145,30 +1145,29 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs) 
void __init rtas_initialize(void)

{

	unsigned long rtas_region = RTAS_INSTANTIATE_MAX;

	const __be32 *basep, *entryp, *sizep;



	/* Get RTAS dev node and fill up our "rtas" structure with infos

	 * about it.

	 */

	rtas.dev = of_find_node_by_name(NULL, "rtas");

	if (rtas.dev) {

		const __be32 *basep, *entryp, *sizep;

	if (!rtas.dev)

		return;



	basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);

	sizep = of_get_property(rtas.dev, "rtas-size", NULL);

		if (basep != NULL && sizep != NULL) {

	if (basep == NULL || sizep == NULL) {

		rtas.dev = NULL;

		return;

	}



	rtas.base = __be32_to_cpu(*basep);

	rtas.size = __be32_to_cpu(*sizep);

			entryp = of_get_property(rtas.dev,

					"linux,rtas-entry", NULL);

	entryp = of_get_property(rtas.dev, "linux,rtas-entry", NULL);

	if (entryp == NULL) /* Ugh */

		rtas.entry = rtas.base;

	else

		rtas.entry = __be32_to_cpu(*entryp);

		} else

			rtas.dev = NULL;

	}

	if (!rtas.dev)

		return;



	/* If RTAS was found, allocate the RMO buffer for it and look for

	 * the stop-self token if any