Changeset 3bacee1 in mainline for boot/arch/sparc64/src/ofw.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• boot/arch/sparc64/src/ofw.c (modified) (2 diffs)

boot/arch/sparc64/src/ofw.c

@@ -88 +88 @@
                                  * "cpuid" for US-IV
                                  */
-                                if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0)
-                                    && (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0)
-                                    && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
+                                if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0) &&
+                                    (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0) &&
+                                    (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
                                         continue;
 
@@ -117 +117 @@
 
         asm volatile (
-                "ldxa [%[zero]] %[asi], %[current_mid]\n"
-                : [current_mid] "=r" (current_mid)
-                : [zero] "r" (0),
-                  [asi] "i" (ASI_ICBUS_CONFIG)
+            "ldxa [%[zero]] %[asi], %[current_mid]\n"
+            : [current_mid] "=r" (current_mid)
+            : [zero] "r" (0),
+              [asi] "i" (ASI_ICBUS_CONFIG)
         );