Module Name: src
Committed By: skrll
Date: Mon Dec 1 08:12:09 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c motg.c ohci.c uhci.c usbdivar.h
xhci.c
Log Message:
Remove usbd_bus no_intrs member it was (virtually) unused.
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.4 -r1.234.2.5 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.254.2.3 -r1.254.2.4 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.264.4.3 -r1.264.4.4 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.109.2.1 -r1.109.2.2 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.28.2.1 -r1.28.2.2 src/sys/dev/usb/xhci.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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.4 src/sys/dev/usb/ehci.c:1.234.2.5
--- src/sys/dev/usb/ehci.c:1.234.2.4 Sun Nov 30 16:38:45 2014
+++ src/sys/dev/usb/ehci.c Mon Dec 1 08:12:09 2014
@@ -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 @@ ehci_intr1(ehci_softc_t *sc)
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();
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.12.2.2 src/sys/dev/usb/motg.c:1.12.2.3
--- src/sys/dev/usb/motg.c:1.12.2.2 Sun Nov 30 13:14:11 2014
+++ src/sys/dev/usb/motg.c Mon Dec 1 08:12:09 2014
@@ -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 @@ motg_intr(struct motg_softc *sc, uint16_
sc->sc_intr_ctrl = ctrl;
if (!sc->sc_bus.use_polling) {
- sc->sc_bus.no_intrs++;
usb_schedsoftintr(&sc->sc_bus);
}
return 1;
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.3 src/sys/dev/usb/ohci.c:1.254.2.4
--- src/sys/dev/usb/ohci.c:1.254.2.3 Sun Nov 30 16:38:45 2014
+++ src/sys/dev/usb/ohci.c Mon Dec 1 08:12:09 2014
@@ -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 @@ ohci_intr1(ohci_softc_t *sc)
return (0);
}
- sc->sc_bus.no_intrs++;
if (eintrs & OHCI_SO) {
sc->sc_overrun_cnt++;
if (usbd_ratecheck(&sc->sc_overrun_ntc)) {
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.3 src/sys/dev/usb/uhci.c:1.264.4.4
--- src/sys/dev/usb/uhci.c:1.264.4.3 Sun Nov 30 16:38:45 2014
+++ src/sys/dev/usb/uhci.c Mon Dec 1 08:12:09 2014
@@ -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 @@ void
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 @@ uhci_intr1(uhci_softc_t *sc)
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)));
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.109.2.1 src/sys/dev/usb/usbdivar.h:1.109.2.2
--- src/sys/dev/usb/usbdivar.h:1.109.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usbdivar.h Mon Dec 1 08:12:09 2014
@@ -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 @@ struct usbd_bus {
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
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.1 src/sys/dev/usb/xhci.c:1.28.2.2
--- src/sys/dev/usb/xhci.c:1.28.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/xhci.c Mon Dec 1 08:12:09 2014
@@ -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 @@ xhci_intr1(struct xhci_softc * const sc)
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;
