From owner-p4-projects@FreeBSD.ORG  Mon Oct 20 22:14:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADEC71065676; Mon, 20 Oct 2008 22:14:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 743951065672
	for <perforce@freebsd.org>; Mon, 20 Oct 2008 22:14:19 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6251B8FC21
	for <perforce@freebsd.org>; Mon, 20 Oct 2008 22:14:19 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9KMEJEa074100
	for <perforce@freebsd.org>; Mon, 20 Oct 2008 22:14:19 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KMEJHH074098
	for perforce@freebsd.org; Mon, 20 Oct 2008 22:14:19 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Mon, 20 Oct 2008 22:14:19 GMT
Message-Id: <200810202214.m9KMEJHH074098@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151633 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Oct 2008 22:14:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=151633

Change 151633 by nwhitehorn@nwhitehorn_trantor on 2008/10/20 22:13:30

	Fix messed up indentation.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#4 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#4 (text+ko) ====

@@ -438,7 +438,7 @@
 
 static int
 nexus_activate_resource(device_t bus, device_t child, int type, int rid,
-struct resource *res)
+    struct resource *res)
 {
 	if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
 		vm_offset_t start;
@@ -459,47 +459,45 @@
 
 static int
 nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
-struct resource *res)
+    struct resource *res)
 {
-
-/* Not much to be done yet... */
-return (rman_deactivate_resource(res));
+	/* Not much to be done yet... */
+	return (rman_deactivate_resource(res));
 }
 
 static int
 nexus_release_resource(device_t bus, device_t child, int type, int rid,
-struct resource *res)
+    struct resource *res)
 {
+	if (type != SYS_RES_IRQ) {
+		device_printf(bus, "unknown resource request from %s\n",
+		    device_get_nameunit(child));
+		return (EINVAL);
+	}
 
-if (type != SYS_RES_IRQ) {
-	device_printf(bus, "unknown resource request from %s\n",
-	    device_get_nameunit(child));
-	return (EINVAL);
+	return (rman_release_resource(res));
 }
 
-return (rman_release_resource(res));
-}
-
 static device_t
 nexus_device_from_node(device_t parent, phandle_t node)
 {
-device_t	cdev;
-struct		nexus_devinfo *dinfo;
-char		*name, *type, *compatible;
+	device_t	cdev;
+	struct		nexus_devinfo *dinfo;
+	char		*name, *type, *compatible;
 
-OF_getprop_alloc(node, "name", 1, (void **)&name);
-OF_getprop_alloc(node, "device_type", 1, (void **)&type);
-OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
-cdev = device_add_child(parent, NULL, -1);
-if (cdev != NULL) {
-	dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
-	dinfo->ndi_node = node;
-	dinfo->ndi_name = name;
-	dinfo->ndi_device_type = type;
-	dinfo->ndi_compatible = compatible;
-	device_set_ivars(cdev, dinfo);
-} else
-	free(name, M_OFWPROP);
+	OF_getprop_alloc(node, "name", 1, (void **)&name);
+	OF_getprop_alloc(node, "device_type", 1, (void **)&type);
+	OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
+	cdev = device_add_child(parent, NULL, -1);
+	if (cdev != NULL) {
+		dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
+		dinfo->ndi_node = node;
+		dinfo->ndi_name = name;
+		dinfo->ndi_device_type = type;
+		dinfo->ndi_compatible = compatible;
+		device_set_ivars(cdev, dinfo);
+	} else
+		free(name, M_OFWPROP);
 
 	return (cdev);
 }