Fix function prototype for device_shutdown method.

5 files changed, 19 insertions, 11 deletions

diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 303adb3..8c4ee65 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -208,7 +208,7 @@ static void rl_reset(struct rl_softc *);
 static int rl_resume(device_t);
 static void rl_rxeof(struct rl_softc *);
 static void rl_setmulti(struct rl_softc *);
-static void rl_shutdown(device_t);
+static int rl_shutdown(device_t);
 static void rl_start(struct ifnet *);
 static void rl_start_locked(struct ifnet *);
 static void rl_stop(struct rl_softc *);
@@ -1799,7 +1799,7 @@ rl_resume(device_t dev)
  * Stop all chip I/O so that the kernel's probe routines don't
  * get confused by errant DMAs when rebooting.
  */
-static void
+static int
 rl_shutdown(device_t dev)
 {
 	struct rl_softc		*sc;
@@ -1809,4 +1809,6 @@ rl_shutdown(device_t dev)
 	RL_LOCK(sc);
 	rl_stop(sc);
 	RL_UNLOCK(sc);
+
+	return (0);
 }
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index c76f4d3..b3f6086 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -147,7 +147,7 @@ static void sf_init(void *);
 static void sf_init_locked(struct sf_softc *);
 static void sf_stop(struct sf_softc *);
 static void sf_watchdog(struct ifnet *);
-static void sf_shutdown(device_t);
+static int sf_shutdown(device_t);
 static int sf_ifmedia_upd(struct ifnet *);
 static void sf_ifmedia_upd_locked(struct ifnet *);
 static void sf_ifmedia_sts(struct ifnet *, struct ifmediareq *);
@@ -1588,7 +1588,7 @@ sf_watchdog(ifp)
 	SF_UNLOCK(sc);
 }
 
-static void
+static int
 sf_shutdown(dev)
 	device_t		dev;
 {
@@ -1599,4 +1599,6 @@ sf_shutdown(dev)
 	SF_LOCK(sc);
 	sf_stop(sc);
 	SF_UNLOCK(sc);
+
+	return (0);
 }
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 57a1377..e285e50 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -109,7 +109,7 @@ static int ste_encap(struct ste_softc *, struct ste_chain *, struct mbuf *);
 static void ste_start(struct ifnet *);
 static void ste_start_locked(struct ifnet *);
 static void ste_watchdog(struct ifnet *);
-static void ste_shutdown(device_t);
+static int ste_shutdown(device_t);
 static int ste_newbuf(struct ste_softc *, struct ste_chain_onefrag *,
 		struct mbuf *);
 static int ste_ifmedia_upd(struct ifnet *);
@@ -1736,7 +1736,7 @@ ste_watchdog(ifp)
 	return;
 }
 
-static void
+static int
 ste_shutdown(dev)
 	device_t		dev;
 {
@@ -1748,5 +1748,5 @@ ste_shutdown(dev)
 	ste_stop(sc);
 	STE_UNLOCK(sc);
 
-	return;
+	return (0);
 }
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index dd514ee..0550e9b 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -186,7 +186,7 @@ static void vr_init(void *);
 static void vr_init_locked(struct vr_softc *);
 static void vr_stop(struct vr_softc *);
 static void vr_watchdog(struct ifnet *);
-static void vr_shutdown(device_t);
+static int vr_shutdown(device_t);
 static int vr_ifmedia_upd(struct ifnet *);
 static void vr_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 
@@ -1595,9 +1595,11 @@ vr_stop(struct vr_softc *sc)
  * Stop all chip I/O so that the kernel's probe routines don't
  * get confused by errant DMAs when rebooting.
  */
-static void
+static int
 vr_shutdown(device_t dev)
 {
 
 	vr_detach(dev);
+
+	return (0);
 }
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index a14ade7..094c0af 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -246,7 +246,7 @@ static void xl_init(void *);
 static void xl_init_locked(struct xl_softc *);
 static void xl_stop(struct xl_softc *);
 static int xl_watchdog(struct xl_softc *);
-static void xl_shutdown(device_t);
+static int xl_shutdown(device_t);
 static int xl_suspend(device_t);
 static int xl_resume(device_t);
 
@@ -3344,7 +3344,7 @@ xl_stop(struct xl_softc *sc)
  * Stop all chip I/O so that the kernel's probe routines don't
  * get confused by errant DMAs when rebooting.
  */
-static void
+static int
 xl_shutdown(device_t dev)
 {
 	struct xl_softc		*sc;
@@ -3355,6 +3355,8 @@ xl_shutdown(device_t dev)
 	xl_reset(sc);
 	xl_stop(sc);
 	XL_UNLOCK(sc);
+
+	return (0);
 }
 
 static int