CVS commit: [jmcneill-usbmp] src/sys

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sat Feb 25 21:15:39 UTC 2012

Modified Files:
        src/sys/arch/mips/adm5120/dev [jmcneill-usbmp]: ahci.c
        src/sys/dev/ic [jmcneill-usbmp]: sl811hs.c

Log Message:
catch up with bus->intr_context going away.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.31.2.1 -r1.31.2.2 src/sys/dev/ic/sl811hs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.7 src/sys/arch/mips/adm5120/dev/ahci.c:1.7.6.1
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.7	Fri Jul  1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/dev/ahci.c	Sat Feb 25 21:15:39 2012
@@ -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 @@ ahci_poll_hub(void *arg)
 	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 @@ ahci_poll_device(void *arg)
 
 	xfer->status = USBD_NORMAL_COMPLETION;
 	s = splusb();
-	xfer->device->bus->intr_context++;
 	usb_transfer_complete(xfer);
-	xfer->device->bus->intr_context--;
 	splx(s);
 }
 

Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.31.2.1 src/sys/dev/ic/sl811hs.c:1.31.2.2
--- src/sys/dev/ic/sl811hs.c:1.31.2.1	Sun Dec  4 13:23:16 2011
+++ src/sys/dev/ic/sl811hs.c	Sat Feb 25 21:15:38 2012
@@ -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 @@ slhci_do_callback(struct slhci_softc *sc
 
 	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 @@ slhci_do_callback(struct slhci_softc *sc
 	*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 @@ slhci_log_sc(void)
 
 	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