Module Name: src Committed By: jmcneill Date: Sat Aug 9 13:33:43 UTC 2014
Modified Files: src/sys/dev/usb: auvitek.c auvitekvar.h Log Message: remove unused mutex and cv To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/auvitek.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/auvitekvar.h 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/auvitek.c diff -u src/sys/dev/usb/auvitek.c:1.8 src/sys/dev/usb/auvitek.c:1.9 --- src/sys/dev/usb/auvitek.c:1.8 Mon Jan 9 10:57:34 2012 +++ src/sys/dev/usb/auvitek.c Sat Aug 9 13:33:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: auvitek.c,v 1.8 2012/01/09 10:57:34 jmcneill Exp $ */ +/* $NetBSD: auvitek.c,v 1.9 2014/08/09 13:33:43 jmcneill Exp $ */ /*- * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.8 2012/01/09 10:57:34 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.9 2014/08/09 13:33:43 jmcneill Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -117,8 +117,6 @@ auvitek_attach(device_t parent, device_t sc->sc_dying = sc->sc_running = 0; mutex_init(&sc->sc_subdev_lock, MUTEX_DEFAULT, IPL_NONE); - mutex_init(&sc->sc_ab.ab_lock, MUTEX_DEFAULT, IPL_USB); - cv_init(&sc->sc_ab.ab_cv, "auvitekbulk"); err = usbd_set_config_index(dev, 0, 1); if (err) { @@ -303,8 +301,6 @@ auvitek_detach(device_t self, int flags) if (sc->sc_ab.ab_bx[i].bx_xfer) usbd_free_xfer(sc->sc_ab.ab_bx[i].bx_xfer); } - cv_destroy(&sc->sc_ab.ab_cv); - mutex_destroy(&sc->sc_ab.ab_lock); return 0; } Index: src/sys/dev/usb/auvitekvar.h diff -u src/sys/dev/usb/auvitekvar.h:1.7 src/sys/dev/usb/auvitekvar.h:1.8 --- src/sys/dev/usb/auvitekvar.h:1.7 Sun Oct 2 19:15:40 2011 +++ src/sys/dev/usb/auvitekvar.h Sat Aug 9 13:33:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: auvitekvar.h,v 1.7 2011/10/02 19:15:40 jmcneill Exp $ */ +/* $NetBSD: auvitekvar.h,v 1.8 2014/08/09 13:33:43 jmcneill Exp $ */ /*- * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca> @@ -95,8 +95,6 @@ struct auvitek_bulk { usbd_pipe_handle ab_pipe; struct auvitek_bulk_xfer ab_bx[AUVITEK_NBULK_XFERS]; bool ab_running; - kmutex_t ab_lock; - kcondvar_t ab_cv; }; struct auvitek_softc {