Tue May 10 21:15:54 2016 UTC ()

Remove comment about splusb and replace with KASSERT(mutex_owned())


(skrll)

diff -r1.59 -r1.60 src/sys/dev/ic/sl811hs.c

--- src/sys/dev/ic/sl811hs.c 2016/05/10 21:13:48	1.59
+++ src/sys/dev/ic/sl811hs.c 2016/05/10 21:15:54	1.60

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sl811hs.c,v 1.59 2016/05/10 21:13:48 skrll Exp $	*/
+/*	$NetBSD: sl811hs.c,v 1.60 2016/05/10 21:15:54 skrll Exp $	*/
 /*
  * Not (c) 2007 Matthew Orgass
  * This file is public domain, meaning anyone can make any use of part or all
  * of this file including copying into other works without credit.  Any use,
  * modified or not, is solely the responsibility of the user.  If this file is
  * part of a collection then use in the collection is governed by the terms of
  * the collection.
  */
 /*
  * Cypress/ScanLogic SL811HS/T USB Host Controller
  * Datasheet, Errata, and App Note available at www.cypress.com
 @@ -58,27 +58,27 @@
  */
 /*
  * XXX TODO:
  *   copy next output packet while transfering
  *   usb suspend
  *   could keep track of known values of all buffer space?
  *   combined print/log function for errors
+ *
  *   ub_usepolling support is untested and may not work
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.59 2016/05/10 21:13:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.60 2016/05/10 21:15:54 skrll Exp $");
 #include "opt_slhci.h"
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/gcq.h>
 @@ -1286,43 +1286,44 @@ slhci_activate(device_t self, enum devac
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}
 void
 slhci_abort(struct usbd_xfer *xfer)
+{
 	SLHCIHIST_FUNC(); SLHCIHIST_CALLED();
 	struct slhci_softc *sc;
 	struct slhci_pipe *spipe;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	spipe = SLHCI_PIPE2SPIPE(xfer->ux_pipe);
 	if (spipe == NULL)
 		goto callback;
 	sc = SLHCI_XFER2SC(xfer);
 	KASSERT(mutex_owned(&sc->sc_lock));
 	DLOG(D_TRACE, "%s abort xfer %p spipe %p spipe->xfer %p",
 	    pnames(spipe->ptype), xfer, spipe, spipe->xfer);
 	slhci_lock_call(sc, &slhci_do_abort, spipe, xfer);
 callback:
 	xfer->ux_status = USBD_CANCELLED;
 	/* Abort happens at IPL_USB. */
 	usb_transfer_complete(xfer);
+}
 void
 slhci_close(struct usbd_pipe *pipe)
+{
 	SLHCIHIST_FUNC(); SLHCIHIST_CALLED();
 	struct slhci_softc *sc;
 	struct slhci_pipe *spipe;
 	sc = SLHCI_PIPE2SC(pipe);
 	spipe = SLHCI_PIPE2SPIPE(pipe);