[src/trunk]: src/sys/dev/cardbus Use Cardbus_intr_disestablish() instead of c...

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

details:   https://anonhg.NetBSD.org/src/rev/48805061f723
branches:  trunk
changeset: 753161:48805061f723
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Mar 19 01:34:46 2010 +0000

description:
Use Cardbus_intr_disestablish() instead of cardbus_intr_disestablish().

Get rid of a (short) staircase in ex_cardbus_detach().

diffstat:

 sys/dev/cardbus/if_ex_cardbus.c |  44 ++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diffs (82 lines):

diff -r c8dba3cf9d03 -r 48805061f723 sys/dev/cardbus/if_ex_cardbus.c
--- a/sys/dev/cardbus/if_ex_cardbus.c   Fri Mar 19 01:32:30 2010 +0000
+++ b/sys/dev/cardbus/if_ex_cardbus.c   Fri Mar 19 01:34:46 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ex_cardbus.c,v 1.51 2010/03/10 21:00:36 dyoung Exp $        */
+/*     $NetBSD: if_ex_cardbus.c,v 1.52 2010/03/19 01:34:46 dyoung Exp $        */
 
 /*
  * Copyright (c) 1998 and 1999
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.51 2010/03/10 21:00:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.52 2010/03/19 01:34:46 dyoung Exp $");
 
 /* #define EX_DEBUG 4 */       /* define to report information for debugging */
 
@@ -300,7 +300,7 @@
 }
 
 int
-ex_cardbus_detach(device_t self, int arg)
+ex_cardbus_detach(device_t self, int flags)
 {
        struct ex_cardbus_softc *csc = device_private(self);
        struct ex_softc *sc = &csc->sc_softc;
@@ -313,23 +313,23 @@
        }
 #endif
 
-       rv = ex_detach(sc);
-       if (rv == 0) {
-               /*
-                * Unhook the interrupt handler.
-                */
-               Cardbus_intr_disestablish(ct, sc->sc_ih);
+       if ((rv = ex_detach(sc)) != 0)
+               return rv;
+
+       /*
+        * Unhook the interrupt handler.
+        */
+       Cardbus_intr_disestablish(ct, sc->sc_ih);
 
-               if (csc->sc_cardtype == EX_CB_CYCLONE) {
-                       Cardbus_mapreg_unmap(ct,
-                           CARDBUS_3C575BTX_FUNCSTAT_PCIREG,
-                           csc->sc_funct, csc->sc_funch, csc->sc_funcsize);
-               }
+       if (csc->sc_cardtype == EX_CB_CYCLONE) {
+               Cardbus_mapreg_unmap(ct,
+                   CARDBUS_3C575BTX_FUNCSTAT_PCIREG,
+                   csc->sc_funct, csc->sc_funch, csc->sc_funcsize);
+       }
 
-               Cardbus_mapreg_unmap(ct, PCI_BAR0, sc->sc_iot,
-                   sc->sc_ioh, csc->sc_mapsize);
-       }
-       return (rv);
+       Cardbus_mapreg_unmap(ct, PCI_BAR0, sc->sc_iot,
+           sc->sc_ioh, csc->sc_mapsize);
+       return 0;
 }
 
 int
@@ -354,11 +354,11 @@
 ex_cardbus_disable(struct ex_softc *sc)
 {
        struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc;
-       cardbus_function_tag_t cf = csc->sc_ct->ct_cf;
-       cardbus_chipset_tag_t cc = csc->sc_ct->ct_cc;
 
-       cardbus_intr_disestablish(cc, cf, sc->sc_ih);
-       sc->sc_ih = NULL;
+       if (sc->sc_ih != NULL) {
+               Cardbus_intr_disestablish(csc->sc_ct, sc->sc_ih);
+               sc->sc_ih = NULL;
+       }
 
        Cardbus_function_disable(csc->sc_ct);