Module Name:    src
Committed By:   tsutsui
Date:           Mon Sep 23 17:11:22 UTC 2013

Modified Files:
        src/sys/arch/luna68k/luna68k: mainbus.c

Log Message:
Misc cleanup.

- use bool instead of int
- avoid an assignment as a value with extra parentheses
- use aprint_normal(9) for attach message
- remove parentheses from return value


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/luna68k/luna68k/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/luna68k/luna68k/mainbus.c
diff -u src/sys/arch/luna68k/luna68k/mainbus.c:1.11 src/sys/arch/luna68k/luna68k/mainbus.c:1.12
--- src/sys/arch/luna68k/luna68k/mainbus.c:1.11	Mon Sep 23 17:02:18 2013
+++ src/sys/arch/luna68k/luna68k/mainbus.c	Mon Sep 23 17:11:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2013/09/23 17:02:18 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.12 2013/09/23 17:11:22 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2013/09/23 17:02:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2013/09/23 17:11:22 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,12 +67,13 @@ CFATTACH_DECL_NEW(mainbus, 0,
 static int
 mainbus_match(device_t parent, cfdata_t cf, void *args)
 {
-	static int mainbus_matched;
+	static bool mainbus_matched;
 
 	if (mainbus_matched)
-		return (0);
+		return 0;
 
-	return ((mainbus_matched = 1));
+	mainbus_matched = true;
+	return 1;
 }
 
 static void
@@ -89,7 +90,7 @@ mainbus_attach(device_t parent, device_t
 		devs = luna_devs;
 		ndevs = __arraycount(luna_devs);
 	}
-	printf("\n");
+	aprint_normal("\n");
 	for (i = 0; i < ndevs; i++) {
 		ma = devs[i];
 		config_found(self, &ma, mainbus_print);
@@ -104,5 +105,5 @@ mainbus_print(void *aux, const char *pnp
 	if (pnp)
 		aprint_normal("%s at %s", ma->ma_name, pnp);
 
-	return (UNCONF);
+	return UNCONF;
 }

Reply via email to