Kill ACPIVERBOSE. It was never used and is worthless to boot.

comments jmc
ok toby

4 files changed, 5 insertions, 31 deletions

diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 51dcd1d0f9d..1acdc31de41 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acpi.4,v 1.32 2008/05/31 22:02:03 sobrado Exp $
+.\"	$OpenBSD: acpi.4,v 1.33 2008/06/07 17:00:38 marco Exp $
 .\"
 .\" Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2008 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt ACPI 4
 .Os
 .Sh NAME
@@ -22,19 +22,12 @@
 .Nd Advanced Configuration and Power Interface
 .Sh SYNOPSIS
 .Cd "acpi0 at bios?"
-.Pp
-.Cd "option ACPIVERBOSE"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides basic support for ACPI including loading ACPI tables from
 the firmware, parsing and interpreting AML code, event handling,
 suspending and powering off, and attaching device drivers.
-.Pp
-If the configuration option
-.Dq Dv ACPIVERBOSE
-is set, information about all detected ACPI devices will be displayed
-on boot.
 Userland may access
 .Nm
 by using the
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 6d8113af67c..0bb94c73392 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.231 2008/05/27 19:45:29 oga Exp $
+#	$OpenBSD: GENERIC,v 1.232 2008/06/07 17:00:38 marco Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -37,8 +37,6 @@ isa0	at pcib?
 isa0	at amdpcib?
 pci*	at mainbus0
 
-#option		ACPIVERBOSE
-
 acpi0		at bios?
 acpitimer*	at acpi?
 acpihpet*	at acpi?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0e0e860b206..09b120f3fe4 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.618 2008/05/23 14:04:18 brad Exp $
+#	$OpenBSD: GENERIC,v 1.619 2008/06/07 17:00:38 marco Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -42,7 +42,6 @@ cpu0	at mainbus?
 bios0	at mainbus0
 apm0	at bios0 flags 0x0000	# flags 0x0101 to force protocol version 1.1
 acpi0	at bios?
-#option	ACPIVERBOSE
 pcibios0 at bios0 flags 0x0000	# use 0x30 for a total verbose
 ipmi0	at mainbus? disable	# IPMI
 esm0	at mainbus? 		# Dell Embedded Server Management
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 99b7981289e..6d3176924b3 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi.c,v 1.121 2008/06/06 09:15:32 marco Exp $	*/
+/*	$OpenBSD: acpi.c,v 1.122 2008/06/07 17:00:38 marco Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -636,30 +636,14 @@ acpi_submatch(struct device *parent, void *match, void *aux)
 int
 acpi_print(void *aux, const char *pnp)
 {
-	/* XXX ACPIVERBOSE should be replaced with dnprintf */
 	struct acpi_attach_args *aa = aux;
-#ifdef ACPIVERBOSE
-	struct acpi_table_header *hdr =
-		(struct acpi_table_header *)aa->aaa_table;
-#endif
 
 	if (pnp) {
 		if (aa->aaa_name)
 			printf("%s at %s", aa->aaa_name, pnp);
-#ifdef ACPIVERBOSE
-		else
-			printf("acpi device at %s from", pnp);
-#else
 		else
 			return (QUIET);
-#endif
 	}
-#ifdef ACPIVERBOSE
-	if (hdr)
-		printf(" table %c%c%c%c",
-		    hdr->signature[0], hdr->signature[1],
-		    hdr->signature[2], hdr->signature[3]);
-#endif
 
 	return (UNCONF);
 }