Author: yongari
Date: Fri Oct 8 23:29:45 2010
New Revision: 213638
URL: http://svn.freebsd.org/changeset/base/213638
Log:
MFC r188463:
Fix shutdown prototypes.
Modified:
stable/7/sys/dev/sis/if_sis.c
stable/7/sys/dev/tx/if_tx.c
stable/7/sys/pci/if_tl.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/sis/if_sis.c
==============================================================================
--- stable/7/sys/dev/sis/if_sis.c Fri Oct 8 23:16:02 2010
(r213637)
+++ stable/7/sys/dev/sis/if_sis.c Fri Oct 8 23:29:45 2010
(r213638)
@@ -2377,7 +2377,7 @@ sis_stop(struct sis_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
sis_shutdown(device_t dev)
{
struct sis_softc *sc;
@@ -2386,6 +2386,7 @@ sis_shutdown(device_t dev)
SIS_LOCK(sc);
sis_stop(sc);
SIS_UNLOCK(sc);
+ return (0);
}
static int
Modified: stable/7/sys/dev/tx/if_tx.c
==============================================================================
--- stable/7/sys/dev/tx/if_tx.c Fri Oct 8 23:16:02 2010 (r213637)
+++ stable/7/sys/dev/tx/if_tx.c Fri Oct 8 23:29:45 2010 (r213638)
@@ -120,7 +120,7 @@ static void epic_ifmedia_sts(struct ifne
static int epic_probe(device_t);
static int epic_attach(device_t);
-static void epic_shutdown(device_t);
+static int epic_shutdown(device_t);
static int epic_detach(device_t);
static void epic_release(epic_softc_t *);
static struct epic_type *epic_devtype(device_t);
@@ -508,7 +508,7 @@ epic_detach(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
epic_shutdown(device_t dev)
{
epic_softc_t *sc;
@@ -516,6 +516,7 @@ epic_shutdown(device_t dev)
sc = device_get_softc(dev);
epic_stop(sc);
+ return (0);
}
/*
Modified: stable/7/sys/pci/if_tl.c
==============================================================================
--- stable/7/sys/pci/if_tl.c Fri Oct 8 23:16:02 2010 (r213637)
+++ stable/7/sys/pci/if_tl.c Fri Oct 8 23:29:45 2010 (r213638)
@@ -282,7 +282,7 @@ static void tl_init(void *);
static void tl_init_locked(struct tl_softc *);
static void tl_stop(struct tl_softc *);
static void tl_watchdog(struct ifnet *);
-static void tl_shutdown(device_t);
+static int tl_shutdown(device_t);
static int tl_ifmedia_upd(struct ifnet *);
static void tl_ifmedia_sts(struct ifnet *, struct ifmediareq *);
@@ -2347,7 +2347,7 @@ tl_stop(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
tl_shutdown(dev)
device_t dev;
{
@@ -2359,5 +2359,5 @@ tl_shutdown(dev)
tl_stop(sc);
TL_UNLOCK(sc);
- return;
+ return (0);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
