Module Name: src
Committed By: mrg
Date: Sun Feb 19 21:37:13 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: usbdi.c
Log Message:
remove the spl handling from usb_insert_transfer() since we're
already holding the relevant lock (which is asserted.)
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.5 -r1.134.2.6 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.134.2.5 src/sys/dev/usb/usbdi.c:1.134.2.6
--- src/sys/dev/usb/usbdi.c:1.134.2.5 Fri Dec 9 01:53:00 2011
+++ src/sys/dev/usb/usbdi.c Sun Feb 19 21:37:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.134.2.5 2011/12/09 01:53:00 mrg Exp $ */
+/* $NetBSD: usbdi.c,v 1.134.2.6 2012/02/19 21:37:12 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.5 2011/12/09 01:53:00 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.6 2012/02/19 21:37:12 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
@@ -881,7 +881,6 @@ usb_insert_transfer(usbd_xfer_handle xfe
{
usbd_pipe_handle pipe = xfer->pipe;
usbd_status err;
- int s;
DPRINTFN(5,("usb_insert_transfer: pipe=%p running=%d timeout=%d\n",
pipe, pipe->running, xfer->timeout));
@@ -896,7 +895,6 @@ usb_insert_transfer(usbd_xfer_handle xfe
}
xfer->busy_free = XFER_ONQU;
#endif
- s = splusb();
SIMPLEQ_INSERT_TAIL(&pipe->queue, xfer, next);
if (pipe->running)
err = USBD_IN_PROGRESS;
@@ -904,7 +902,6 @@ usb_insert_transfer(usbd_xfer_handle xfe
pipe->running = 1;
err = USBD_NORMAL_COMPLETION;
}
- splx(s);
return (err);
}
