[src/jmcneill-usbmp]: src/sys catch up with bus->intr_context going away.

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

details:   https://anonhg.NetBSD.org/src/rev/d8c14662f16d
branches:  jmcneill-usbmp
changeset: 771822:d8c14662f16d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Feb 25 21:15:38 2012 +0000

description:
catch up with bus->intr_context going away.

diffstat:

 sys/arch/mips/adm5120/dev/ahci.c |  8 ++------
 sys/dev/ic/sl811hs.c             |  9 +++------
 2 files changed, 5 insertions(+), 12 deletions(-)

diffs (82 lines):

diff -r 6a47d6e47a63 -r d8c14662f16d sys/arch/mips/adm5120/dev/ahci.c
--- a/sys/arch/mips/adm5120/dev/ahci.c  Sat Feb 25 20:54:03 2012 +0000
+++ b/sys/arch/mips/adm5120/dev/ahci.c  Sat Feb 25 21:15:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $  */
+/*     $NetBSD: ahci.c,v 1.7.6.1 2012/02/25 21:15:39 mrg Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.7.6.1 2012/02/25 21:15:39 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -460,9 +460,7 @@
        xfer->actlen = 1;
        xfer->status = USBD_NORMAL_COMPLETION;
        s = splusb();
-       xfer->device->bus->intr_context++;
        usb_transfer_complete(xfer);
-       xfer->device->bus->intr_context--;
        splx(s);
 }
 
@@ -1289,9 +1287,7 @@
 
        xfer->status = USBD_NORMAL_COMPLETION;
        s = splusb();
-       xfer->device->bus->intr_context++;
        usb_transfer_complete(xfer);
-       xfer->device->bus->intr_context--;
        splx(s);
 }
 
diff -r 6a47d6e47a63 -r d8c14662f16d sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c      Sat Feb 25 20:54:03 2012 +0000
+++ b/sys/dev/ic/sl811hs.c      Sat Feb 25 21:15:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sl811hs.c,v 1.31.2.1 2011/12/04 13:23:16 jmcneill Exp $        */
+/*     $NetBSD: sl811hs.c,v 1.31.2.2 2012/02/25 21:15:38 mrg Exp $     */
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.31.2.1 2011/12/04 13:23:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.31.2.2 2012/02/25 21:15:38 mrg Exp $");
 
 #include "opt_slhci.h"
 
@@ -1471,7 +1471,6 @@
 
        int repeat;
 
-       sc->sc_bus.intr_context++;
        start_cc_time(&t_callback, (u_int)xfer);
        simple_unlock(&sc->sc_lock);
        splx(*s);
@@ -1483,7 +1482,6 @@
        *s = splhardusb();
        simple_lock(&sc->sc_lock);
        stop_cc_time(&t_callback);
-       sc->sc_bus.intr_context--;
 
        if (repeat && !sc->sc_bus.use_polling)
                slhci_do_repeat(sc, xfer);
@@ -3661,8 +3659,7 @@
 
        DDOLOG("frame=%d rootintr=%p", t->frame, t->rootintr, 0,0);
 
-       DDOLOG("use_polling=%d intr_context=%d", ssc->sc_bus.use_polling,
-           ssc->sc_bus.intr_context, 0,0);
+       DDOLOG("use_polling=%d", ssc->sc_bus.use_polling, 0,0);
 }
 
 void