More cases of shutdown hooks not needed after card is already stopped. In

these cases the xxstop function is a bit more complicated and has a flag of
some sort, but the use of that flag does not matter;  DMA is already ceased
ok dlg

1 files changed, 1 insertions, 24 deletions

diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c
index 4f92d0a389f..9092b53de80 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6915.c,v 1.8 2008/11/28 02:44:17 brad Exp $	*/
+/*	$OpenBSD: aic6915.c,v 1.9 2009/08/10 20:29:54 deraadt Exp $	*/
 /*	$NetBSD: aic6915.c,v 1.15 2005/12/24 20:27:29 perry Exp $	*/
 
 /*-
@@ -81,8 +81,6 @@ int	sf_ioctl(struct ifnet *, u_long, caddr_t);
 int	sf_init(struct ifnet *);
 void	sf_stop(struct ifnet *, int);
 
-void	sf_shutdown(void *);
-
 void	sf_txintr(struct sf_softc *);
 void	sf_rxintr(struct sf_softc *);
 void	sf_stats_update(struct sf_softc *);
@@ -306,14 +304,6 @@ sf_attach(struct sf_softc *sc)
 	 */
 	if_attach(ifp);
 	ether_ifattach(ifp);
-
-	/*
-	 * Make sure the interface is shutdown during reboot.
-	 */
-	sc->sc_sdhook = shutdownhook_establish(sf_shutdown, sc);
-	if (sc->sc_sdhook == NULL)
-		printf("%s: WARNING: unable to establish shutdown hook\n",
-		    sc->sc_dev.dv_xname);
 	return;
 
 	/*
@@ -345,19 +335,6 @@ sf_attach(struct sf_softc *sc)
 }
 
 /*
- * sf_shutdown:
- *
- *	Shutdown hook -- make sure the interface is stopped at reboot.
- */
-void
-sf_shutdown(void *arg)
-{
-	struct sf_softc *sc = arg;
-
-	sf_stop(&sc->sc_arpcom.ac_if, 1);
-}
-
-/*
  * sf_start:		[ifnet interface function]
  *
  *	Start packet transmission on the interface.