svn commit: r188463 - in head/sys/dev: sis tl tx
Warner Losh
imp at FreeBSD.org
Tue Feb 10 15:17:21 PST 2009
Author: imp
Date: Tue Feb 10 23:17:20 2009
New Revision: 188463
URL: http://svn.freebsd.org/changeset/base/188463
Log:
Fix shutdown prototypes.
Modified:
head/sys/dev/sis/if_sis.c
head/sys/dev/tl/if_tl.c
head/sys/dev/tx/if_tx.c
Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c Tue Feb 10 23:13:48 2009 (r188462)
+++ head/sys/dev/sis/if_sis.c Tue Feb 10 23:17:20 2009 (r188463)
@@ -2257,7 +2257,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;
@@ -2267,6 +2267,7 @@ sis_shutdown(device_t dev)
sis_reset(sc);
sis_stop(sc);
SIS_UNLOCK(sc);
+ return (0);
}
static device_method_t sis_methods[] = {
Modified: head/sys/dev/tl/if_tl.c
==============================================================================
--- head/sys/dev/tl/if_tl.c Tue Feb 10 23:13:48 2009 (r188462)
+++ head/sys/dev/tl/if_tl.c Tue Feb 10 23:17:20 2009 (r188463)
@@ -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);
}
Modified: head/sys/dev/tx/if_tx.c
==============================================================================
--- head/sys/dev/tx/if_tx.c Tue Feb 10 23:13:48 2009 (r188462)
+++ head/sys/dev/tx/if_tx.c Tue Feb 10 23:17:20 2009 (r188463)
@@ -122,7 +122,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);
@@ -502,7 +502,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;
@@ -512,6 +512,7 @@ epic_shutdown(device_t dev)
EPIC_LOCK(sc);
epic_stop(sc);
EPIC_UNLOCK(sc);
+ return (0);
}
/*
More information about the svn-src-all
mailing list