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

wdog_shutdown() for external usage.

11 files changed, 22 insertions, 22 deletions

diff --git a/sys/dev/ipmi.c b/sys/dev/ipmi.c
index dd4c8c177ae..8e0705c9365 100644
--- a/sys/dev/ipmi.c
+++ b/sys/dev/ipmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi.c,v 1.65 2010/05/24 14:25:20 deraadt Exp $ */
+/*	$OpenBSD: ipmi.c,v 1.66 2012/10/17 22:32:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave
@@ -1744,7 +1744,7 @@ ipmi_attach(struct device *parent, struct device *self, void *aux)
 
 	/* Setup Watchdog timer */
 	sc->sc_wdog_period = 0;
-	wdog_register(sc, ipmi_watchdog);
+	wdog_register(ipmi_watchdog, sc);
 
 	/* lock around read_sensor so that no one messes with the bmc regs */
 	rw_init(&sc->sc_lock, DEVNAME(sc));
diff --git a/sys/dev/isa/fins.c b/sys/dev/isa/fins.c
index bf4ae3d2fc9..af5087fb17e 100644
--- a/sys/dev/isa/fins.c
+++ b/sys/dev/isa/fins.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fins.c,v 1.2 2009/03/30 00:36:26 deraadt Exp $	*/
+/*	$OpenBSD: fins.c,v 1.3 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Mark Kettenis
@@ -300,7 +300,7 @@ fins_attach(struct device *parent, struct device *self, void *aux)
 	sc->fins_wdog_cr = fins_read_wdog(sc, FINS_WDOG_CR1);
 	sc->fins_wdog_cr &= ~(FINS_WDOG_MINS | FINS_WDOG_EN);
 	fins_write_wdog(sc, FINS_WDOG_CR1, sc->fins_wdog_cr);
-	wdog_register(sc, fins_wdog_cb);
+	wdog_register(fins_wdog_cb, sc);
 attach_done:
 	printf("\n");
 }
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index bed72d7e166..92d34bd3c42 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: it.c,v 1.40 2011/01/20 16:59:55 form Exp $	*/
+/*	$OpenBSD: it.c,v 1.41 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru>
@@ -229,7 +229,7 @@ it_attach(struct device *parent, struct device *self, void *aux)
 		it_writereg(sc->sc_iot, sc->sc_ioh, IT_LDN, IT_WDT_LDN);
 		it_writereg(sc->sc_iot, sc->sc_ioh, IT_WDT_CSR, 0x00);
 		it_writereg(sc->sc_iot, sc->sc_ioh, IT_WDT_TCR, 0x00);
-		wdog_register(sc, it_wdog_cb);
+		wdog_register(it_wdog_cb, sc);
 	}
 
 	/* exit MB PnP mode and unmap */
diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c
index 64c2f7e0e06..87cd1da851e 100644
--- a/sys/dev/isa/sch311x.c
+++ b/sys/dev/isa/sch311x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sch311x.c,v 1.12 2009/08/22 03:51:07 mk Exp $	*/
+/*	$OpenBSD: sch311x.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2009 Michael Knudsen <mk@openbsd.org>
@@ -487,7 +487,7 @@ schsio_wdt_init(struct schsio_softc *sc)
 	reg &= ~(SCHSIO_WDT_CFG_MSEN | SCHSIO_WDT_CFG_MSEN);
 	bus_space_write_1(sc->sc_iot, sc->sc_ioh_rr, SCHSIO_WDT_CFG, reg);
 
-	wdog_register(sc, schsio_wdt_cb);
+	wdog_register(schsio_wdt_cb, sc);
 }
 
 int
diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c
index 08be95cd50e..3b82c46ded5 100644
--- a/sys/dev/isa/viasio.c
+++ b/sys/dev/isa/viasio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viasio.c,v 1.12 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: viasio.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $	*/
 /*
  * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -478,7 +478,7 @@ viasio_wdg_init(struct viasio_softc *sc)
 	}
 
 	/* Register new watchdog */
-	wdog_register(sc, viasio_wdg_cb);
+	wdog_register(viasio_wdg_cb, sc);
 }
 
 int
diff --git a/sys/dev/pci/berkwdt.c b/sys/dev/pci/berkwdt.c
index c3b5d42f2da..47eaaa1c593 100644
--- a/sys/dev/pci/berkwdt.c
+++ b/sys/dev/pci/berkwdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: berkwdt.c,v 1.6 2010/04/08 00:23:53 tedu Exp $ */
+/*	$OpenBSD: berkwdt.c,v 1.7 2012/10/17 22:32:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 2009 Wim Van Sebroeck <wim@iguana.be>
@@ -210,7 +210,7 @@ berkwdt_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_period = 0;
 
 	/* register with the watchdog framework */
-	wdog_register(sc, berkwdt_set_timeout);
+	wdog_register(berkwdt_set_timeout, sc);
 }
 
 int
diff --git a/sys/dev/pci/glxpcib.c b/sys/dev/pci/glxpcib.c
index 30a4dcde277..9f89180cde7 100644
--- a/sys/dev/pci/glxpcib.c
+++ b/sys/dev/pci/glxpcib.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glxpcib.c,v 1.6 2012/10/08 21:47:50 deraadt Exp $	*/
+/*      $OpenBSD: glxpcib.c,v 1.7 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -301,7 +301,7 @@ glxpcib_attach(struct device *parent, struct device *self, void *aux)
 		bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMD5536_MFGPT0_SETUP,
 		    AMD5536_MFGPT_CNT_EN | AMD5536_MFGPT_CMP2EV |
 		    AMD5536_MFGPT_CMP2 | AMD5536_MFGPT_DIV_MASK);
-		wdog_register(sc, glxpcib_wdogctl_cb);
+		wdog_register(glxpcib_wdogctl_cb, sc);
 		sc->sc_wdog = 1;
 		printf(", watchdog");
 	}
diff --git a/sys/dev/pci/ichwdt.c b/sys/dev/pci/ichwdt.c
index a6000205b48..2d690932bdc 100644
--- a/sys/dev/pci/ichwdt.c
+++ b/sys/dev/pci/ichwdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ichwdt.c,v 1.3 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: ichwdt.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Alexander Yurchenko <grange@openbsd.org>
@@ -136,7 +136,7 @@ ichwdt_attach(struct device *parent, struct device *self, void *aux)
 	printf("\n");
 
 	/* Register new watchdog */
-	wdog_register(sc, ichwdt_cb);
+	wdog_register(ichwdt_cb, sc);
 }
 
 int
diff --git a/sys/dev/pci/pwdog.c b/sys/dev/pci/pwdog.c
index 8d5f65f7bc2..c95d9aeb116 100644
--- a/sys/dev/pci/pwdog.c
+++ b/sys/dev/pci/pwdog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
+/*	$OpenBSD: pwdog.c,v 1.8 2012/10/17 22:32:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -79,7 +79,7 @@ pwdog_attach(struct device *parent, struct device *self, void *aux)
 	}
 	printf("\n");
 	bus_space_write_1(pwdog->iot, pwdog->ioh, PWDOG_DISABLE, 0);
-	wdog_register(pwdog, pwdog_set_timeout);
+	wdog_register(pwdog_set_timeout, pwdog);
 }
 
 int
diff --git a/sys/dev/pci/tcpcib.c b/sys/dev/pci/tcpcib.c
index 906f2354e19..3f8386c78db 100644
--- a/sys/dev/pci/tcpcib.c
+++ b/sys/dev/pci/tcpcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpcib.c,v 1.3 2012/06/04 20:08:10 kettenis Exp $	*/
+/*	$OpenBSD: tcpcib.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2012 Matt Dainty <matt@bodgit-n-scarper.com>
@@ -257,7 +257,7 @@ tcpcib_attach(struct device *parent, struct device *self, void *aux)
 		sc->sc_active |= E600_WDT_ACTIVE;
 
 		/* Register new watchdog */
-		wdog_register(sc, tcpcib_wdt_cb);
+		wdog_register(tcpcib_wdt_cb, sc);
 	}
 
 corepcib:
diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c
index b19cdab91e0..2b48fe304f2 100644
--- a/sys/dev/pci/wdt.c
+++ b/sys/dev/pci/wdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdt.c,v 1.20 2011/04/03 15:36:03 jasper Exp $	*/
+/*	$OpenBSD: wdt.c,v 1.21 2012/10/17 22:32:01 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1998,1999 Alex Nash
@@ -156,7 +156,7 @@ wdt_attach(struct device *parent, struct device *self, void *aux)
 	/*
 	 * register with the watchdog framework
 	 */
-	wdog_register(wdt, wdt_set_timeout);
+	wdog_register(wdt_set_timeout, wdt);
 }
 
 /*