[src/nick-nhusb]: src/sys/dev/usb Remove usbd_bus no_intrs member it was (vir...

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

details:   https://anonhg.NetBSD.org/src/rev/402bdbcb15fd
branches:  nick-nhusb
changeset: 334056:402bdbcb15fd
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Dec 01 08:12:09 2014 +0000

description:
Remove usbd_bus no_intrs member it was (virtually) unused.

diffstat:

 sys/dev/usb/ehci.c     |  5 ++---
 sys/dev/usb/motg.c     |  5 ++---
 sys/dev/usb/ohci.c     |  5 ++---
 sys/dev/usb/uhci.c     |  6 ++----
 sys/dev/usb/usbdivar.h |  3 +--
 sys/dev/usb/xhci.c     |  5 ++---
 6 files changed, 11 insertions(+), 18 deletions(-)

diffs (155 lines):

diff -r 22015003db6f -r 402bdbcb15fd sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Sun Nov 30 16:39:51 2014 +0000
+++ b/sys/dev/usb/ehci.c        Mon Dec 01 08:12:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.234.2.4 2014/11/30 16:38:45 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.234.2.5 2014/12/01 08:12:09 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.4 2014/11/30 16:38:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.5 2014/12/01 08:12:09 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -694,7 +694,6 @@
                return (0);
 
        EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
-       sc->sc_bus.no_intrs++;
        if (eintrs & EHCI_STS_IAA) {
                USBHIST_LOG(ehcidebug, "door bell", 0, 0, 0, 0);
                kpreempt_disable();
diff -r 22015003db6f -r 402bdbcb15fd sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Sun Nov 30 16:39:51 2014 +0000
+++ b/sys/dev/usb/motg.c        Mon Dec 01 08:12:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.12.2.2 2014/11/30 13:14:11 skrll Exp $      */
+/*     $NetBSD: motg.c,v 1.12.2.3 2014/12/01 08:12:09 skrll Exp $      */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 #include "opt_motg.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.2 2014/11/30 13:14:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.3 2014/12/01 08:12:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -699,7 +699,6 @@
        sc->sc_intr_ctrl = ctrl;
 
        if (!sc->sc_bus.use_polling) {
-               sc->sc_bus.no_intrs++;
                usb_schedsoftintr(&sc->sc_bus);
        }
        return 1;
diff -r 22015003db6f -r 402bdbcb15fd sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sun Nov 30 16:39:51 2014 +0000
+++ b/sys/dev/usb/ohci.c        Mon Dec 01 08:12:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.254.2.3 2014/11/30 16:38:45 skrll Exp $     */
+/*     $NetBSD: ohci.c,v 1.254.2.4 2014/12/01 08:12:09 skrll Exp $     */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.3 2014/11/30 16:38:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.4 2014/12/01 08:12:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1170,7 +1170,6 @@
                return (0);
        }
 
-       sc->sc_bus.no_intrs++;
        if (eintrs & OHCI_SO) {
                sc->sc_overrun_cnt++;
                if (usbd_ratecheck(&sc->sc_overrun_ntc)) {
diff -r 22015003db6f -r 402bdbcb15fd sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Sun Nov 30 16:39:51 2014 +0000
+++ b/sys/dev/usb/uhci.c        Mon Dec 01 08:12:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.264.4.3 2014/11/30 16:38:45 skrll Exp $     */
+/*     $NetBSD: uhci.c,v 1.264.4.4 2014/12/01 08:12:09 skrll Exp $     */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.3 2014/11/30 16:38:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.4 2014/12/01 08:12:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -854,7 +854,6 @@
 uhci_dump_all(uhci_softc_t *sc)
 {
        uhci_dumpregs(sc);
-       printf("intrs=%d\n", sc->sc_bus.no_intrs);
        /*printf("framelist[i].link = %08x\n", sc->sc_framelist[0].link);*/
        uhci_dump_qhs(sc->sc_lctl_start);
 }
@@ -1363,7 +1362,6 @@
                return (0);     /* nothing to acknowledge */
        UWRITE2(sc, UHCI_STS, ack); /* acknowledge the ints */
 
-       sc->sc_bus.no_intrs++;
        usb_schedsoftintr(&sc->sc_bus);
 
        DPRINTFN(15, ("%s: uhci_intr: exit\n", device_xname(sc->sc_dev)));
diff -r 22015003db6f -r 402bdbcb15fd sys/dev/usb/usbdivar.h
--- a/sys/dev/usb/usbdivar.h    Sun Nov 30 16:39:51 2014 +0000
+++ b/sys/dev/usb/usbdivar.h    Mon Dec 01 08:12:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdivar.h,v 1.109.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/*     $NetBSD: usbdivar.h,v 1.109.2.2 2014/12/01 08:12:09 skrll Exp $ */
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -157,7 +157,6 @@
        char                    use_polling;
        device_t                usbctl;
        struct usb_device_stats stats;
-       u_int                   no_intrs;
        int                     usbrev; /* USB revision */
 #define USBREV_UNKNOWN 0
 #define USBREV_PRE_1_0 1
diff -r 22015003db6f -r 402bdbcb15fd sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Sun Nov 30 16:39:51 2014 +0000
+++ b/sys/dev/usb/xhci.c        Mon Dec 01 08:12:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.28.2.1 2014/11/30 12:18:58 skrll Exp $      */
+/*     $NetBSD: xhci.c,v 1.28.2.2 2014/12/01 08:12:09 skrll Exp $      */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.2 2014/12/01 08:12:09 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -946,7 +946,6 @@
        usbsts = xhci_op_read_4(sc, XHCI_USBSTS);
        DPRINTFN(16, "USBSTS %08x", usbsts, 0, 0, 0);
 
-       sc->sc_bus.no_intrs++;
        usb_schedsoftintr(&sc->sc_bus);
 
        return 1;