]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
x86/platform/olpc: Trivial code move in DT fixup
authorLubomir Rintel <lkundrak@v3.sk>
Thu, 18 Apr 2019 14:46:48 +0000 (16:46 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Thu, 18 Apr 2019 19:51:36 +0000 (21:51 +0200)
This makes the following patch more concise.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
arch/x86/platform/olpc/olpc_dt.c

index 87e1d81684c6b3ab2d5b78e9fb329a6627338fc2..820236b511b329ad2857e1d9abdae48b1e814290 100644 (file)
@@ -241,11 +241,6 @@ void __init olpc_dt_fixup(void)
 
        pr_info("PROM DT: Old firmware detected, applying fixes\n");
 
 
        pr_info("PROM DT: Old firmware detected, applying fixes\n");
 
-       /* Add olpc,xo1-battery compatible marker to battery node */
-       olpc_dt_interpret("\" /battery@0\" find-device");
-       olpc_dt_interpret("  \" olpc,xo1-battery\" +compatible");
-       olpc_dt_interpret("device-end");
-
        board_rev = olpc_dt_get_board_revision();
        if (!board_rev)
                return;
        board_rev = olpc_dt_get_board_revision();
        if (!board_rev)
                return;
@@ -271,6 +266,11 @@ void __init olpc_dt_fixup(void)
                olpc_dt_interpret(" \" olpc,xo1-rtc\" +compatible");
                olpc_dt_interpret("device-end");
        }
                olpc_dt_interpret(" \" olpc,xo1-rtc\" +compatible");
                olpc_dt_interpret("device-end");
        }
+
+       /* Add olpc,xo1-battery compatible marker to battery node */
+       olpc_dt_interpret("\" /battery@0\" find-device");
+       olpc_dt_interpret("  \" olpc,xo1-battery\" +compatible");
+       olpc_dt_interpret("device-end");
 }
 
 void __init olpc_dt_build_devicetree(void)
 }
 
 void __init olpc_dt_build_devicetree(void)