[src/trunk]: src/sys/dev/ic Make ahd_detach() take struct ahd_softc * rather ...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/56a322727574
branches:  trunk
changeset: 747200:56a322727574
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 05 12:50:53 2009 +0000

description:
Make ahd_detach() take struct ahd_softc * rather than device_t
as well as ahd_attach().  (currently no backend calls it though)

diffstat:

 sys/dev/ic/aic79xx_osm.c |  8 +++-----
 sys/dev/ic/aic79xx_osm.h |  8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 1c3523659774 -r 56a322727574 sys/dev/ic/aic79xx_osm.c
--- a/sys/dev/ic/aic79xx_osm.c  Sat Sep 05 12:50:33 2009 +0000
+++ b/sys/dev/ic/aic79xx_osm.c  Sat Sep 05 12:50:53 2009 +0000
@@ -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);
 
diff -r 1c3523659774 -r 56a322727574 sys/dev/ic/aic79xx_osm.h
--- a/sys/dev/ic/aic79xx_osm.h  Sat Sep 05 12:50:33 2009 +0000
+++ b/sys/dev/ic/aic79xx_osm.h  Sat Sep 05 12:50:53 2009 +0000
@@ -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)