A few more simple cases of shutdown hooks which only call xxstop, when

we now know the interface has already been stopped

1 files changed, 1 insertions, 18 deletions

diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index a41a7c982dc..4cfea0ad730 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.43 2008/11/28 02:44:18 brad Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.44 2009/08/10 19:41:05 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -149,7 +149,6 @@ int wb_ioctl(struct ifnet *, u_long, caddr_t);
 void wb_init(void *);
 void wb_stop(struct wb_softc *);
 void wb_watchdog(struct ifnet *);
-void wb_shutdown(void *);
 int wb_ifmedia_upd(struct ifnet *);
 void wb_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 
@@ -855,8 +854,6 @@ wb_attach(parent, self, aux)
 	 */
 	if_attach(ifp);
 	ether_ifattach(ifp);
-
-	shutdownhook_establish(wb_shutdown, sc);
 	return;
 
 fail_5:
@@ -1689,20 +1686,6 @@ void wb_stop(sc)
 		sizeof(sc->wb_ldata->wb_tx_list));
 }
 
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-void wb_shutdown(arg)
-	void			*arg;
-{
-	struct wb_softc		*sc = (struct wb_softc *)arg;
-
-	wb_stop(sc);
-
-	return;
-}
-
 struct cfattach wb_ca = {
 	sizeof(struct wb_softc), wb_probe, wb_attach
 };