[src/trunk]: src/sys/dev/isa Call the common detach routine, com_detach(), an...

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

details:   https://anonhg.NetBSD.org/src/rev/889d1f5ba67b
branches:  trunk
changeset: 749004:889d1f5ba67b
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Nov 12 20:28:32 2009 +0000

description:
Call the common detach routine, com_detach(), and get out on error,
before starting the bus-specific detachment.

com_activate() is going away, so don't use it any more.

diffstat:

 sys/dev/isa/com_isa.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 69769fd0a9c2 -r 889d1f5ba67b sys/dev/isa/com_isa.c
--- a/sys/dev/isa/com_isa.c     Thu Nov 12 20:15:02 2009 +0000
+++ b/sys/dev/isa/com_isa.c     Thu Nov 12 20:28:32 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_isa.c,v 1.35 2009/04/02 00:09:33 dyoung Exp $      */
+/*     $NetBSD: com_isa.c,v 1.36 2009/11/12 20:28:32 dyoung Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.35 2009/04/02 00:09:33 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.36 2009/11/12 20:28:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -108,7 +108,7 @@
 
 
 CFATTACH_DECL3_NEW(com_isa, sizeof(struct com_isa_softc),
-    com_isa_probe, com_isa_attach, com_isa_detach, com_activate,
+    com_isa_probe, com_isa_attach, com_isa_detach, NULL,
     NULL, NULL, DVF_DETACH_SHUTDOWN);
 
 int
@@ -252,14 +252,14 @@
        const struct com_regs *cr = &sc->sc_regs;
        int rc;
 
+       if ((rc = com_detach(self, flags)) != 0)
+               return rc;
+
        if (isc->sc_ih != NULL)
                isa_intr_disestablish(isc->sc_ic, isc->sc_ih);
 
        pmf_device_deregister(self);
 
-       if ((rc = com_detach(self, flags)) != 0)
-               return rc;
-
        com_cleanup(self, 0);
 
 #ifdef COM_HAYESP