Get rid of the (unused) ``no accounting'' bus_space_{map,unmap} routines.

2 files changed, 10 insertions, 14 deletions

diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h
index bb349715186..4ce5d9a345a 100644
--- a/sys/arch/vax/include/bus.h
+++ b/sys/arch/vax/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.13 2009/12/25 20:52:57 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.14 2009/12/26 14:45:35 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $	*/
 
 /*-
@@ -83,9 +83,9 @@ struct vax_bus_space {
 
 	/* mapping/unmapping */
 	int		(*vbs_map)(void *, bus_addr_t, bus_size_t,
-			    int, bus_space_handle_t *, int);
+			    int, bus_space_handle_t *);
 	void		(*vbs_unmap)(void *, bus_space_handle_t,
-			    bus_size_t, int);
+			    bus_size_t);
 	int		(*vbs_subregion)(void *, bus_space_handle_t,
 			    bus_size_t, bus_size_t, bus_space_handle_t *);
 
@@ -112,9 +112,7 @@ struct vax_bus_space {
 #define	BUS_SPACE_MAP_PREFETCHABLE	0x04
 
 #define	bus_space_map(t, a, s, f, hp)					\
-	(*(t)->vbs_map)((t)->vbs_cookie, (a), (s), (f), (hp), 1)
-#define	vax_bus_space_map_noacct(t, a, s, f, hp)			\
-	(*(t)->vbs_map)((t)->vbs_cookie, (a), (s), (f), (hp), 0)
+	(*(t)->vbs_map)((t)->vbs_cookie, (a), (s), (f), (hp))
 
 /*
  *	int bus_space_unmap(bus_space_tag_t t,
@@ -124,9 +122,7 @@ struct vax_bus_space {
  */
 
 #define bus_space_unmap(t, h, s)					\
-	(*(t)->vbs_unmap)((t)->vbs_cookie, (h), (s), 1)
-#define vax_bus_space_unmap_noacct(t, h, s)				\
-	(*(t)->vbs_unmap)((t)->vbs_cookie, (h), (s), 0)
+	(*(t)->vbs_unmap)((t)->vbs_cookie, (h), (s))
 
 /*
  *	int bus_space_subregion(bus_space_tag_t t,
diff --git a/sys/arch/vax/vax/bus_mem.c b/sys/arch/vax/vax/bus_mem.c
index fcb6c0047d6..12420c324eb 100644
--- a/sys/arch/vax/vax/bus_mem.c
+++ b/sys/arch/vax/vax/bus_mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_mem.c,v 1.6 2009/12/25 20:52:57 miod Exp $	*/
+/*	$OpenBSD: bus_mem.c,v 1.7 2009/12/26 14:45:36 miod Exp $	*/
 /*	$NetBSD: bus_mem.c,v 1.8 2000/06/29 07:14:23 mrg Exp $ */
 /*
  * Copyright (c) 1998 Matt Thomas
@@ -47,8 +47,8 @@
 #include <machine/intr.h>
 
 int	 vax_mem_bus_space_map(void *, bus_addr_t, bus_size_t, int,
-	    bus_space_handle_t *, int);
-void	 vax_mem_bus_space_unmap(void *, bus_space_handle_t, bus_size_t, int);
+	    bus_space_handle_t *);
+void	 vax_mem_bus_space_unmap(void *, bus_space_handle_t, bus_size_t);
 int	 vax_mem_bus_space_subregion(void *, bus_space_handle_t, bus_size_t,
 	    bus_size_t, bus_space_handle_t *);
 int	 vax_mem_bus_space_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
@@ -58,7 +58,7 @@ void	*vax_mem_bus_space_vaddr(void *, bus_space_handle_t);
 
 int
 vax_mem_bus_space_map(void *t, bus_addr_t pa, bus_size_t size, int flags,
-    bus_space_handle_t *bshp, int f2)
+    bus_space_handle_t *bshp)
 {
 	vaddr_t va;
 
@@ -83,7 +83,7 @@ vax_mem_bus_space_subregion(void *t, bus_space_handle_t h, bus_size_t o,
 }
 
 void
-vax_mem_bus_space_unmap(void *t, bus_space_handle_t h, bus_size_t size, int f)
+vax_mem_bus_space_unmap(void *t, bus_space_handle_t h, bus_size_t size)
 {
 	u_long va = trunc_page(h);
 	u_long endva = round_page(h + size);