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: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 112cc3b2ee1a17226263d799af931571b2afd1b9..9759dcbd055d13c09fff4dd94dbaad85ac3f81a5 100644 (file)
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -1145,31 +1145,30 @@ 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;
-
-               basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);
-               sizep = of_get_property(rtas.dev, "rtas-size", NULL);
-               if (basep != NULL && sizep != NULL) {
-                       rtas.base = __be32_to_cpu(*basep);
-                       rtas.size = __be32_to_cpu(*sizep);
-                       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;
 
+       basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);
+       sizep = of_get_property(rtas.dev, "rtas-size", 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);
+       if (entryp == NULL) /* Ugh */
+               rtas.entry = rtas.base;
+       else
+               rtas.entry = __be32_to_cpu(*entryp);
+
        /* If RTAS was found, allocate the RMO buffer for it and look for
         * the stop-self token if any
         */