Swap arguments to wdog_register() since it is nicer, and prepare

wdog_shutdown() for external usage.

6 files changed, 12 insertions, 12 deletions

diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c
index 579416495a3..c90b2c42aa1 100644
--- a/sys/arch/i386/i386/esm.c
+++ b/sys/arch/i386/i386/esm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esm.c,v 1.52 2010/07/02 01:35:13 tedu Exp $ */
+/*	$OpenBSD: esm.c,v 1.53 2012/10/17 22:31:59 deraadt Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -253,7 +253,7 @@ esm_attach(struct device *parent, struct device *self, void *aux)
 	}
 
 	sc->sc_wdog_period = 0;
-	wdog_register(sc, esm_watchdog);
+	wdog_register(esm_watchdog, sc);
 	printf("\n");
 
 	strlcpy(sc->sc_sensordev.xname, DEVNAME(sc),
diff --git a/sys/arch/i386/pci/elan520.c b/sys/arch/i386/pci/elan520.c
index a0c57db6e43..3bf5acbb6e9 100644
--- a/sys/arch/i386/pci/elan520.c
+++ b/sys/arch/i386/pci/elan520.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elan520.c,v 1.17 2010/04/20 22:05:41 tedu Exp $	*/
+/*	$OpenBSD: elan520.c,v 1.18 2012/10/17 22:32:01 deraadt Exp $	*/
 /*	$NetBSD: elan520.c,v 1.4 2002/10/02 05:47:15 thorpej Exp $	*/
 
 /*-
@@ -157,7 +157,7 @@ elansc_attach(struct device *parent, struct device *self, void *aux)
 	/* ...and clear it. */
 	elansc_wdogctl_reset(sc);
 
-	wdog_register(sc, elansc_wdogctl_cb);
+	wdog_register(elansc_wdogctl_cb, sc);
 	elansc = sc;
 	cpu_setperf = elansc_setperf;
 	cpu_cpuspeed = elansc_cpuspeed;
diff --git a/sys/arch/i386/pci/geodesc.c b/sys/arch/i386/pci/geodesc.c
index b9e74f84564..3594aa313a6 100644
--- a/sys/arch/i386/pci/geodesc.c
+++ b/sys/arch/i386/pci/geodesc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: geodesc.c,v 1.10 2012/08/16 18:42:04 tedu Exp $	*/
+/*	$OpenBSD: geodesc.c,v 1.11 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
@@ -120,7 +120,7 @@ geodesc_attach(struct device *parent, struct device *self, void *aux)
 	cnfg |= WDTYPE1_RESET|WDPRES_DIV_512;
 	bus_space_write_2(sc->sc_iot, sc->sc_ioh, GCB_WDCNFG, cnfg);
 
-	wdog_register(sc, geodesc_wdogctl_cb);
+	wdog_register(geodesc_wdogctl_cb, sc);
 #endif /* SMALL_KERNEL */
 
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, GCB_TSCNFG, TSC_ENABLE);
diff --git a/sys/arch/sgi/localbus/imc.c b/sys/arch/sgi/localbus/imc.c
index c952a5cf946..0190974390d 100644
--- a/sys/arch/sgi/localbus/imc.c
+++ b/sys/arch/sgi/localbus/imc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imc.c,v 1.12 2012/10/03 11:18:23 miod Exp $	*/
+/*	$OpenBSD: imc.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $	*/
 /*	$NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $	*/
 
 /*
@@ -684,7 +684,7 @@ imc_attach(struct device *parent, struct device *self, void *aux)
 #endif
 
 	/* Register watchdog */
-	wdog_register(self, imc_watchdog_cb);
+	wdog_register(imc_watchdog_cb, self);
 }
 
 int
diff --git a/sys/arch/sparc64/dev/lom.c b/sys/arch/sparc64/dev/lom.c
index 35159ac65f2..a4ce57ba5e8 100644
--- a/sys/arch/sparc64/dev/lom.c
+++ b/sys/arch/sparc64/dev/lom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lom.c,v 1.22 2010/05/28 10:02:44 kettenis Exp $	*/
+/*	$OpenBSD: lom.c,v 1.23 2012/10/17 22:32:01 deraadt Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -352,7 +352,7 @@ lom_attach(struct device *parent, struct device *self, void *aux)
 	timeout_set(&sc->sc_wdog_to, lom_wdog_pat, sc);
 	timeout_add_sec(&sc->sc_wdog_to, LOM_WDOG_TIME_MAX / 2);
 
-	wdog_register(sc, lom_wdog_cb);
+	wdog_register(lom_wdog_cb, sc);
 
 	printf(": %s rev %d.%d\n",
 	    sc->sc_type < LOM_LOMLITE2 ? "LOMlite" : "LOMlite2",
diff --git a/sys/arch/sparc64/dev/pmc.c b/sys/arch/sparc64/dev/pmc.c
index cc5b55864c5..77bd9f0ed68 100644
--- a/sys/arch/sparc64/dev/pmc.c
+++ b/sys/arch/sparc64/dev/pmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmc.c,v 1.2 2009/11/09 20:45:37 kettenis Exp $	*/
+/*	$OpenBSD: pmc.c,v 1.3 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Mark Kettenis
@@ -99,7 +99,7 @@ pmc_attach(struct device *parent, struct device *self, void *aux)
 
 	printf("\n");
 
-	wdog_register(sc, pmc_wdog_cb);
+	wdog_register(pmc_wdog_cb, sc);
 }
 
 int