Index: boot/genarch/ofw_tree.c
===================================================================
--- boot/genarch/ofw_tree.c	(revision 0832b4dbf61c47e06454103bfe90ded222688108)
+++ boot/genarch/ofw_tree.c	(revision 8ea03080b8d59d0c3ee0830f9ea1b08bbedeba88)
@@ -43,8 +43,9 @@
 static ofw_tree_property_t *ofw_tree_properties_alloc(unsigned count)
 {
-	return balloc(count * sizeof(ofw_tree_property_t), sizeof(ofw_tree_property_t));
-}
-
-static void * ofw_tree_space_alloc(size_t size)
+	return balloc(count * sizeof(ofw_tree_property_t),
+	    sizeof(ofw_tree_property_t));
+}
+
+static void *ofw_tree_space_alloc(size_t size)
 {
 	char *addr;
@@ -66,20 +67,22 @@
 }
 
-/** Transfer information from one OpenFirmware node into its memory representation.
- *
- * Transfer entire information from the OpenFirmware device tree 'current' node to
- * its memory representation in 'current_node'. This function recursively processes
- * all node's children. Node's peers are processed iteratively in order to prevent
- * stack from overflowing.
- *
- * @param current_node	Pointer to uninitialized ofw_tree_node structure that will
- * 			become the memory represenation of 'current'.
- * @param parent_node	Parent ofw_tree_node structure or NULL in case of root node.
+/** Transfer information from one OpenFirmware node into its memory
+ * representation.
+ *
+ * Transfer entire information from the OpenFirmware device tree 'current' node
+ * to its memory representation in 'current_node'. This function recursively
+ * processes all node's children. Node's peers are processed iteratively in
+ * order to prevent stack from overflowing.
+ *
+ * @param current_node	Pointer to uninitialized ofw_tree_node structure that
+ * 			will become the memory represenation of 'current'.
+ * @param parent_node	Parent ofw_tree_node structure or NULL in case of root
+ * 			node.
  * @param current	OpenFirmware phandle to the current device tree node.
  */
 static void ofw_tree_node_process(ofw_tree_node_t *current_node,
-	ofw_tree_node_t *parent_node, phandle current)
-{
-	static char path[MAX_PATH_LEN+1];
+    ofw_tree_node_t *parent_node, phandle current)
+{
+	static char path[MAX_PATH_LEN + 1];
 	static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
 	static char name2[OFW_TREE_PROPERTY_MAX_NAMELEN];
@@ -132,5 +135,6 @@
 			child_node = ofw_tree_node_alloc();
 			if (child_node) {
-				ofw_tree_node_process(child_node, current_node, child);
+				ofw_tree_node_process(child_node, current_node,
+				    child);
 				current_node->child = child_node;
 			}
@@ -152,5 +156,6 @@
 		 * Copy properties.
 		 */
-		current_node->property = ofw_tree_properties_alloc(current_node->properties);
+		current_node->property =
+		    ofw_tree_properties_alloc(current_node->properties);
 		if (!current_node->property)
 			return;
@@ -165,6 +170,7 @@
 			memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
 			memcpy(current_node->property[i].name, name,
-				OFW_TREE_PROPERTY_MAX_NAMELEN);
-			current_node->property[i].name[OFW_TREE_PROPERTY_MAX_NAMELEN] = '\0';
+			    OFW_TREE_PROPERTY_MAX_NAMELEN);
+			current_node->property[i].name[
+			    OFW_TREE_PROPERTY_MAX_NAMELEN] = '\0';
 
 			size = ofw_get_proplen(current, name);
@@ -178,5 +184,6 @@
 					 * Copy property value to memory node.
 					 */
-					(void) ofw_get_property(current, name, buf, size);
+					(void) ofw_get_property(current, name,
+					    buf, size);
 				}
 			} else {
@@ -185,5 +192,6 @@
 		}
 
-		current_node->properties = i;	/* Just in case we ran out of memory. */
+		/* Just in case we ran out of memory. */
+		current_node->properties = i;
 
 		/*
@@ -218,5 +226,5 @@
 /** Construct memory representation of OpenFirmware device tree.
  *
- * @return NULL on failure or pointer to the root node.
+ * @return		NULL on failure or pointer to the root node.
  */
 ofw_tree_node_t *ofw_tree_build(void)
@@ -239,6 +247,6 @@
 		ssm = ofw_tree_node_alloc();
 		if (ssm) {
-			ofw_tree_node_process(
-				ssm, root, ofw_find_device("/ssm@0,0"));
+			ofw_tree_node_process(ssm, root,
+			    ofw_find_device("/ssm@0,0"));
 			ssm->peer = root->child;
 			root->child = ssm;