Drop cpu_dep.cpu_subconf routine, which is no longer used after KA820 support

removal.

15 files changed, 15 insertions, 39 deletions

diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index cf9be972be7..79b350094ac 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cpu.h,v 1.38 2011/07/06 18:32:59 miod Exp $      */
+/*      $OpenBSD: cpu.h,v 1.39 2011/07/06 20:42:05 miod Exp $      */
 /*      $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $      */
 
 /*
@@ -91,7 +91,6 @@ struct	cpu_dep {
 	void	(*cpu_halt)(void); /* Cpu dependent halt call */
 	void	(*cpu_reboot)(int); /* Cpu dependent reboot call */
 	void	(*cpu_clrf)(void); /* Clear cold/warm start flags */
-	void	(*cpu_subconf)(struct device *);/*config cpu dep. devs */
 	void	(*cpu_hardclock)(struct clockframe *);	/* hardclock handler */
 };
 
diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c
index d7e3cde8d2f..6258be40385 100644
--- a/sys/arch/vax/vax/autoconf.c
+++ b/sys/arch/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.33 2011/07/06 18:32:59 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.34 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.45 1999/10/23 14:56:05 ragge Exp $	*/
 
 /*
@@ -149,9 +149,6 @@ mainbus_attach(parent, self, hej)
 	}
 #endif
 
-	if (dep_call->cpu_subconf)
-		(*dep_call->cpu_subconf)(self);
-
 #if NLED > 0
 	maa.maa_bustype = VAX_LEDS;
 	config_found(self, &maa, mainbus_print);
diff --git a/sys/arch/vax/vax/ka410.c b/sys/arch/vax/vax/ka410.c
index b4075d467c1..a9a7093fb4f 100644
--- a/sys/arch/vax/vax/ka410.c
+++ b/sys/arch/vax/vax/ka410.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka410.c,v 1.11 2008/08/18 23:07:26 miod Exp $ */
+/*	$OpenBSD: ka410.c,v 1.12 2011/07/06 20:42:05 miod Exp $ */
 /*	$NetBSD: ka410.c,v 1.21 1999/09/06 19:52:53 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -46,7 +46,6 @@
 #include <machine/mtpr.h>
 #include <machine/sid.h>
 #include <machine/pmap.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/ka410.h>
 #include <machine/ka420.h>
@@ -80,7 +79,6 @@ struct	cpu_dep ka410_calls = {
 	ka410_halt,
 	ka410_reboot,
 	ka410_clrf,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka43.c b/sys/arch/vax/vax/ka43.c
index fad08e42188..ceeb901efe8 100644
--- a/sys/arch/vax/vax/ka43.c
+++ b/sys/arch/vax/vax/ka43.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka43.c,v 1.12 2008/08/18 23:05:38 miod Exp $ */
+/*	$OpenBSD: ka43.c,v 1.13 2011/07/06 20:42:05 miod Exp $ */
 /*	$NetBSD: ka43.c,v 1.19 1999/09/06 19:52:53 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -46,7 +46,6 @@
 #include <machine/mtpr.h>
 #include <machine/sid.h>
 #include <machine/pmap.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/vsbus.h>
 #include <machine/ka43.h>
@@ -82,7 +81,6 @@ struct	cpu_dep ka43_calls = {
         ka43_halt,
         ka43_reboot,
         ka43_clrf,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c
index a05f6c7ea1b..95e3977a1d9 100644
--- a/sys/arch/vax/vax/ka46.c
+++ b/sys/arch/vax/vax/ka46.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka46.c,v 1.9 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka46.c,v 1.10 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka46.c,v 1.12 2000/03/04 07:27:49 matt Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
@@ -46,7 +46,6 @@
 #include <machine/mtpr.h>
 #include <machine/sid.h>
 #include <machine/pmap.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/ka410.h>
 #include <machine/ka420.h>
@@ -80,7 +79,6 @@ struct	cpu_dep ka46_calls = {
 	ka46_halt,
 	ka46_reboot,
 	NULL,
-	NULL,
 	ka46_hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka48.c b/sys/arch/vax/vax/ka48.c
index 912b2030583..bf98fc68459 100644
--- a/sys/arch/vax/vax/ka48.c
+++ b/sys/arch/vax/vax/ka48.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka48.c,v 1.10 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka48.c,v 1.11 2011/07/06 20:42:05 miod Exp $	*/
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -47,7 +47,6 @@
 #include <machine/mtpr.h>
 #include <machine/sid.h>
 #include <machine/pmap.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/ka410.h>
 #include <machine/ka420.h>
@@ -80,7 +79,6 @@ struct	cpu_dep ka48_calls = {
 	ka48_halt,
 	ka48_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka49.c b/sys/arch/vax/vax/ka49.c
index eb71fd8a1ba..313aa64daa7 100644
--- a/sys/arch/vax/vax/ka49.c
+++ b/sys/arch/vax/vax/ka49.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka49.c,v 1.9 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka49.c,v 1.10 2011/07/06 20:42:05 miod Exp $	*/
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -65,7 +65,6 @@ struct	cpu_dep ka49_calls = {
 	ka49_halt,
 	ka49_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka53.c b/sys/arch/vax/vax/ka53.c
index bc964a1f9b1..a5f7d11c045 100644
--- a/sys/arch/vax/vax/ka53.c
+++ b/sys/arch/vax/vax/ka53.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka53.c,v 1.7 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka53.c,v 1.8 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka53.c,v 1.2 2000/06/04 02:19:27 matt Exp $	*/
 /*
  * Copyright (c) 2002 Hugh Graham.
@@ -66,7 +66,6 @@ struct cpu_dep ka53_calls = {
 	generic_halt,
 	generic_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka60.c b/sys/arch/vax/vax/ka60.c
index a8db3f103c7..b59621a0991 100644
--- a/sys/arch/vax/vax/ka60.c
+++ b/sys/arch/vax/vax/ka60.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka60.c,v 1.1 2008/08/18 23:19:29 miod Exp $	*/
+/*	$OpenBSD: ka60.c,v 1.2 2011/07/06 20:42:05 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -104,7 +104,6 @@ struct	cpu_dep	ka60_calls = {
 	ka60_reboot,
 #endif
 	ka60_clrf,
-	NULL,
 	ka60_hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka630.c b/sys/arch/vax/vax/ka630.c
index e5381182008..6bcdf7a02c6 100644
--- a/sys/arch/vax/vax/ka630.c
+++ b/sys/arch/vax/vax/ka630.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka630.c,v 1.10 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka630.c,v 1.11 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka630.c,v 1.17 1999/09/06 19:52:52 ragge Exp $	*/
 /*-
  * Copyright (c) 1982, 1988, 1990, 1993
@@ -67,7 +67,6 @@ struct	cpu_dep ka630_calls = {
 	ka630_halt,
 	ka630_reboot,
 	ka630_clrf,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka650.c b/sys/arch/vax/vax/ka650.c
index 988e17e9564..c3f42dbc06d 100644
--- a/sys/arch/vax/vax/ka650.c
+++ b/sys/arch/vax/vax/ka650.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka650.c,v 1.18 2008/08/18 23:07:26 miod Exp $	*/
+/*	$OpenBSD: ka650.c,v 1.19 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka650.c,v 1.25 2001/04/27 15:02:37 ragge Exp $	*/
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -79,7 +79,6 @@ struct	cpu_dep	ka650_calls = {
 	cvax_halt,
 	cvax_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka660.c b/sys/arch/vax/vax/ka660.c
index 6368a459f0d..1405904550d 100644
--- a/sys/arch/vax/vax/ka660.c
+++ b/sys/arch/vax/vax/ka660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka660.c,v 1.6 2009/06/20 20:58:07 miod Exp $	*/
+/*	$OpenBSD: ka660.c,v 1.7 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka660.c,v 1.3 2000/06/29 07:14:27 mrg Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -44,7 +44,6 @@
 #include <machine/mtpr.h>
 #include <machine/sid.h>
 #include <machine/pmap.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/ka410.h>
 #include <machine/ka420.h>
@@ -80,7 +79,6 @@ struct cpu_dep ka660_calls = {
 	generic_halt,
 	generic_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka670.c b/sys/arch/vax/vax/ka670.c
index 35cd8e355de..a1ead555a0d 100644
--- a/sys/arch/vax/vax/ka670.c
+++ b/sys/arch/vax/vax/ka670.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka670.c,v 1.9 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka670.c,v 1.10 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka670.c,v 1.4 2000/03/13 23:52:35 soren Exp $	*/
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
@@ -46,7 +46,6 @@
 #include <machine/mtpr.h>
 #include <machine/sid.h>
 #include <machine/pmap.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/vsbus.h>
 #include <machine/ka670.h>
@@ -70,7 +69,6 @@ struct	cpu_dep ka670_calls = {
 	generic_halt,
 	generic_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/ka680.c b/sys/arch/vax/vax/ka680.c
index 310088509fc..aaaf68f6ce8 100644
--- a/sys/arch/vax/vax/ka680.c
+++ b/sys/arch/vax/vax/ka680.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka680.c,v 1.12 2008/08/18 23:05:38 miod Exp $	*/
+/*	$OpenBSD: ka680.c,v 1.13 2011/07/06 20:42:05 miod Exp $	*/
 /*	$NetBSD: ka680.c,v 1.3 2001/01/28 21:01:53 ragge Exp $	*/
 /*
  * Copyright (c) 2002 Hugh Graham.
@@ -45,7 +45,6 @@
 #include <machine/cpu.h>
 #include <machine/mtpr.h>
 #include <machine/sid.h>
-#include <machine/nexus.h>
 #include <machine/uvax.h>
 #include <machine/ka680.h>
 #include <machine/clock.h>
@@ -98,7 +97,6 @@ struct cpu_dep ka680_calls = {
 	generic_halt,
 	generic_reboot,
 	NULL,
-	NULL,
 	hardclock
 };
 
diff --git a/sys/arch/vax/vax/vxt.c b/sys/arch/vax/vax/vxt.c
index 1420b45bb22..184a5de7018 100644
--- a/sys/arch/vax/vax/vxt.c
+++ b/sys/arch/vax/vax/vxt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vxt.c,v 1.5 2009/06/20 20:58:07 miod Exp $	*/
+/*	$OpenBSD: vxt.c,v 1.6 2011/07/06 20:42:05 miod Exp $	*/
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -71,7 +71,6 @@ struct	cpu_dep vxt_calls = {
 	vxt_halt,
 	vxt_reboot,
 	NULL,
-	NULL,
 	hardclock
 };