[src/trunk]: src/sys/dev/cardbus Simplify interrupt (dis)establishment by two...

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

details:   https://anonhg.NetBSD.org/src/rev/bf2b40d82580
branches:  trunk
changeset: 752665:bf2b40d82580
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Wed Mar 03 00:56:41 2010 +0000

description:
Simplify interrupt (dis)establishment by two source transformations:

-       cardbus_intr_disestablish(cc, cf, ih);
+       Cardbus_intr_disestablish(ct, ih);

-       ih = cardbus_intr_establish(cc, cf, ...);
+       ih = Cardbus_intr_establish(ct, ...);

Compiles.  Untested.  Let me know if you use this hardware with NetBSD
any longer.

diffstat:

 sys/dev/cardbus/rbus_ppb.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 8ce9dadc1a3b -r bf2b40d82580 sys/dev/cardbus/rbus_ppb.c
--- a/sys/dev/cardbus/rbus_ppb.c        Wed Mar 03 00:49:39 2010 +0000
+++ b/sys/dev/cardbus/rbus_ppb.c        Wed Mar 03 00:56:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_ppb.c,v 1.35 2010/02/26 00:57:02 dyoung Exp $     */
+/*     $NetBSD: rbus_ppb.c,v 1.36 2010/03/03 00:56:41 dyoung Exp $     */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.35 2010/02/26 00:57:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.36 2010/03/03 00:56:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -777,7 +777,7 @@
 
        /* Map and establish the interrupt. */
 
-       sc->sc_ih = cardbus_intr_establish(cc, cf, psc->sc_intrline, IPL_NET,
+       sc->sc_ih = Cardbus_intr_establish(ct, psc->sc_intrline, IPL_NET,
            fxp_intr, sc);
        if (NULL == sc->sc_ih) {
                aprint_error_dev(sc->sc_dev, "couldn't establish interrupt\n");
@@ -800,7 +800,7 @@
        cardbus_function_tag_t cf = psc->sc_cf;
 
        /* Remove interrupt handler. */
-       cardbus_intr_disestablish(cc, cf, sc->sc_ih);
+       Cardbus_intr_disestablish(ct, sc->sc_ih);
 
        Cardbus_function_disable(((struct fxp_cardbus_softc *) sc)->ct);
 #endif
@@ -826,7 +826,7 @@
                /*
                 * Unhook the interrupt handler.
                 */
-               cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, sc->sc_ih);
+               Cardbus_intr_disestablish(ct, sc->sc_ih);
 
                /*
                 * release bus space and close window