Module Name: src
Committed By: tsutsui
Date: Sat Sep 5 12:50:53 UTC 2009
Modified Files:
src/sys/dev/ic: aic79xx_osm.c aic79xx_osm.h
Log Message:
Make ahd_detach() take struct ahd_softc * rather than device_t
as well as ahd_attach(). (currently no backend calls it though)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/aic79xx_osm.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/aic79xx_osm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.27 src/sys/dev/ic/aic79xx_osm.c:1.28
--- src/sys/dev/ic/aic79xx_osm.c:1.27 Sat Sep 5 12:46:55 2009
+++ src/sys/dev/ic/aic79xx_osm.c Sat Sep 5 12:50:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.27 2009/09/05 12:46:55 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.28 2009/09/05 12:50:53 tsutsui Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.27 2009/09/05 12:46:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.28 2009/09/05 12:50:53 tsutsui Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic79xx_inline.h>
@@ -804,12 +804,10 @@
}
int
-ahd_detach(device_t self, int flags)
+ahd_detach(struct ahd_softc *ahd, int flags)
{
int rv = 0;
- struct ahd_softc *ahd = device_private(self);
-
if (ahd->sc_child != NULL)
rv = config_detach(ahd->sc_child, flags);
Index: src/sys/dev/ic/aic79xx_osm.h
diff -u src/sys/dev/ic/aic79xx_osm.h:1.18 src/sys/dev/ic/aic79xx_osm.h:1.19
--- src/sys/dev/ic/aic79xx_osm.h:1.18 Wed Sep 2 17:08:12 2009
+++ src/sys/dev/ic/aic79xx_osm.h Sat Sep 5 12:50:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.h,v 1.19 2009/09/05 12:50:53 tsutsui Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $NetBSD: aic79xx_osm.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.19 2009/09/05 12:50:53 tsutsui Exp $
*
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.19 2009/09/05 12:50:53 tsutsui Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
*/
@@ -549,7 +549,7 @@
int ahd_map_int(struct ahd_softc *);
int ahd_attach(struct ahd_softc *);
int ahd_softc_comp(struct ahd_softc *, struct ahd_softc *);
-int ahd_detach(device_t, int);
+int ahd_detach(struct ahd_softc *, int);
#define ahd_platform_init(arg)
