svn commit: r188178 - in head/sys/dev: hifn lmc safe
Warner Losh
imp at FreeBSD.org
Thu Feb 5 11:37:50 PST 2009
Author: imp
Date: Thu Feb 5 19:37:49 2009
New Revision: 188178
URL: http://svn.freebsd.org/changeset/base/188178
Log:
shutdown returns an int
Modified:
head/sys/dev/hifn/hifn7751.c
head/sys/dev/lmc/if_lmc.c
head/sys/dev/lmc/if_lmc.h
head/sys/dev/safe/safe.c
Modified: head/sys/dev/hifn/hifn7751.c
==============================================================================
--- head/sys/dev/hifn/hifn7751.c Thu Feb 5 19:36:14 2009 (r188177)
+++ head/sys/dev/hifn/hifn7751.c Thu Feb 5 19:37:49 2009 (r188178)
@@ -98,7 +98,7 @@ static int hifn_attach(device_t);
static int hifn_detach(device_t);
static int hifn_suspend(device_t);
static int hifn_resume(device_t);
-static void hifn_shutdown(device_t);
+static int hifn_shutdown(device_t);
static int hifn_newsession(device_t, u_int32_t *, struct cryptoini *);
static int hifn_freesession(device_t, u_int64_t);
@@ -691,12 +691,13 @@ hifn_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
hifn_shutdown(device_t dev)
{
#ifdef notyet
hifn_stop(device_get_softc(dev));
#endif
+ return (0);
}
/*
Modified: head/sys/dev/lmc/if_lmc.c
==============================================================================
--- head/sys/dev/lmc/if_lmc.c Thu Feb 5 19:36:14 2009 (r188177)
+++ head/sys/dev/lmc/if_lmc.c Thu Feb 5 19:37:49 2009 (r188178)
@@ -5643,10 +5643,11 @@ fbsd_detach(device_t dev)
return 0; /* no error */
}
-static void
+static int
fbsd_shutdown(device_t dev)
{
shutdown_card(device_get_softc(dev));
+ return 0;
}
static int
Modified: head/sys/dev/lmc/if_lmc.h
==============================================================================
--- head/sys/dev/lmc/if_lmc.h Thu Feb 5 19:36:14 2009 (r188177)
+++ head/sys/dev/lmc/if_lmc.h Thu Feb 5 19:37:49 2009 (r188178)
@@ -1642,7 +1642,7 @@ static void detach_card(softc_t *);
#ifdef __FreeBSD__
static int fbsd_probe(device_t);
static int fbsd_detach(device_t);
-static void fbsd_shutdown(device_t);
+static int fbsd_shutdown(device_t);
static int fbsd_attach(device_t);
#endif /* __FreeBSD__ */
Modified: head/sys/dev/safe/safe.c
==============================================================================
--- head/sys/dev/safe/safe.c Thu Feb 5 19:36:14 2009 (r188177)
+++ head/sys/dev/safe/safe.c Thu Feb 5 19:37:49 2009 (r188178)
@@ -84,7 +84,7 @@ static int safe_attach(device_t);
static int safe_detach(device_t);
static int safe_suspend(device_t);
static int safe_resume(device_t);
-static void safe_shutdown(device_t);
+static int safe_shutdown(device_t);
static int safe_newsession(device_t, u_int32_t *, struct cryptoini *);
static int safe_freesession(device_t, u_int64_t);
@@ -503,12 +503,13 @@ safe_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
safe_shutdown(device_t dev)
{
#ifdef notyet
safe_stop(device_get_softc(dev));
#endif
+ return (0);
}
/*
More information about the svn-src-all
mailing list