Commit cleanup part of the diff that was backed out in the previous commit

(removal of unused functions).

requested by deraadt@

2 files changed, 2 insertions, 67 deletions

diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index b8a1fc8f7f7..8d61157dbf4 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.134 2008/09/29 18:29:43 deraadt Exp $ */
+/* $OpenBSD: dsdt.c,v 1.135 2008/10/04 18:48:04 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -371,16 +371,6 @@ aml_mnem(int opcode, uint8_t *pos)
 }
 #endif /* SMALL_KERNEL */
 
-const char *
-aml_args(int opcode)
-{
-	struct aml_opcode *tab;
-
-	if ((tab = aml_findopcode(opcode)) != NULL)
-		return tab->args;
-	return ("");
-}
-
 struct aml_notify_data {
 	struct aml_node		*node;
 	char			pnpid[20];
@@ -681,60 +671,6 @@ aml_delchildren(struct aml_node *node)
  * @@@: Value functions
  */
 
-struct aml_scope	*aml_pushscope(struct aml_scope *, uint8_t *,
-			    uint8_t *, struct aml_node *);
-struct aml_scope	*aml_popscope(struct aml_scope *);
-
-#define AML_LHS		0
-#define AML_RHS		1
-#define AML_DST		2
-#define AML_DST2	3
-
-/* Allocate+push parser scope */
-struct aml_scope *
-aml_pushscope(struct aml_scope *parent, uint8_t *start, uint8_t  *end,
-    struct aml_node *node)
-{
-	struct aml_scope *scope;
-
-	scope = acpi_os_malloc(sizeof(struct aml_scope));
-	scope->pos = start;
-	scope->end = end;
-	scope->node = node;
-	scope->parent = parent;
-	scope->sc = dsdt_softc;
-
-	aml_lastscope = scope;
-
-	return scope;
-}
-
-struct aml_scope *
-aml_popscope(struct aml_scope *scope)
-{
-	struct aml_scope *nscope;
-	struct aml_vallist *ol;
-	int idx;
-
-	if (scope == NULL)
-		return NULL;
-	nscope = scope->parent;
-
-	/* Free temporary values */
-	while ((ol = scope->tmpvals) != NULL) {
-		scope->tmpvals = ol->next;
-		for (idx = 0; idx < ol->nobj; idx++) {
-			aml_freevalue(&ol->obj[idx]);
-		}
-		acpi_os_free(ol);
-	}
-	acpi_os_free(scope);
-
-	aml_lastscope = nscope;
-
-	return nscope;
-}
-
 /*
  * Field I/O code
  */
diff --git a/sys/dev/acpi/dsdt.h b/sys/dev/acpi/dsdt.h
index e3e7cff3008..459a94fa7b2 100644
--- a/sys/dev/acpi/dsdt.h
+++ b/sys/dev/acpi/dsdt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.h,v 1.40 2008/09/29 18:29:43 deraadt Exp $ */
+/* $OpenBSD: dsdt.h,v 1.41 2008/10/04 18:48:04 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -48,7 +48,6 @@ struct aml_opcode {
 };
 
 const char		*aml_eisaid(u_int32_t);
-const char		*aml_args(int);
 const char		*aml_mnem(int, uint8_t *);
 int64_t			aml_val2int(struct aml_value *);
 struct aml_node		*aml_searchname(struct aml_node *, const void *);