Module Name: src
Committed By: mrg
Date: Sat Feb 25 12:53:35 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: if_kue.c ohci.c uhci.c
Log Message:
remove curproc references
To generate a diff of this commit:
cvs rdiff -u -r1.74.12.1 -r1.74.12.2 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.218.6.13 -r1.218.6.14 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.240.6.12 -r1.240.6.13 src/sys/dev/usb/uhci.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/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.74.12.1 src/sys/dev/usb/if_kue.c:1.74.12.2
--- src/sys/dev/usb/if_kue.c:1.74.12.1 Sat Feb 18 07:35:05 2012
+++ src/sys/dev/usb/if_kue.c Sat Feb 25 12:53:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.74.12.1 2012/02/18 07:35:05 mrg Exp $ */
+/* $NetBSD: if_kue.c,v 1.74.12.2 2012/02/25 12:53:34 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.74.12.1 2012/02/18 07:35:05 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.74.12.2 2012/02/25 12:53:34 mrg Exp $");
#include "opt_inet.h"
@@ -986,13 +986,6 @@ kue_ioctl(struct ifnet *ifp, u_long comm
if (sc->kue_dying)
return (EIO);
-#ifdef DIAGNOSTIC
- if (!curproc) {
- printf("%s: no proc!!\n", device_xname(sc->kue_dev));
- return EIO;
- }
-#endif
-
s = splnet();
switch(command) {
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.218.6.13 src/sys/dev/usb/ohci.c:1.218.6.14
--- src/sys/dev/usb/ohci.c:1.218.6.13 Sat Feb 25 10:26:23 2012
+++ src/sys/dev/usb/ohci.c Sat Feb 25 12:53:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.218.6.13 2012/02/25 10:26:23 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.218.6.14 2012/02/25 12:53:34 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.13 2012/02/25 10:26:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.14 2012/02/25 12:53:34 mrg Exp $");
#include "opt_usb.h"
@@ -2323,7 +2323,7 @@ ohci_abort_xfer(usbd_xfer_handle xfer, u
return;
}
- if (xfer->device->bus->intr_context || !curproc)
+ if (xfer->device->bus->intr_context)
panic("ohci_abort_xfer: not in process context");
/*
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.240.6.12 src/sys/dev/usb/uhci.c:1.240.6.13
--- src/sys/dev/usb/uhci.c:1.240.6.12 Sat Feb 25 10:26:23 2012
+++ src/sys/dev/usb/uhci.c Sat Feb 25 12:53:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.240.6.12 2012/02/25 10:26:23 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.240.6.13 2012/02/25 12:53:34 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.12 2012/02/25 10:26:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.13 2012/02/25 12:53:34 mrg Exp $");
#include "opt_usb.h"
@@ -2152,7 +2152,7 @@ uhci_abort_xfer(usbd_xfer_handle xfer, u
return;
}
- if (xfer->device->bus->intr_context || !curproc)
+ if (xfer->device->bus->intr_context)
panic("uhci_abort_xfer: not in process context");
/*
