diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/nmdm/nmdm.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/ugen.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/uhid.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/ulpt.c | 10 | ||||
| -rw-r--r-- | sys/dev/usb/ums.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 4 |
6 files changed, 2 insertions, 35 deletions
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c index a899176b4e42..1511e9b2c987 100644 --- a/sys/dev/nmdm/nmdm.c +++ b/sys/dev/nmdm/nmdm.c @@ -604,8 +604,8 @@ nmdmshutdown(void) nextdev2 = makedev(CDEV_MAJOR, (i+i) + 1); ptr1 = nextdev1->si_drv1; if (ptr1) { - revoke_and_destroy_dev(nextdev1); - revoke_and_destroy_dev(nextdev2); + destroy_dev(nextdev1); + destroy_dev(nextdev2); free(ptr1, M_NLMDM); } else { freedev(nextdev1); diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index b056d2f1040d..6232918c547e 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -273,7 +273,6 @@ ugen_destroy_devnodes(struct ugen_softc *sc) { int endptno; dev_t dev; - struct vnode *vp; /* destroy all devices for the other (existing) endpoints as well */ for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++) { @@ -289,9 +288,6 @@ ugen_destroy_devnodes(struct ugen_softc *sc) */ dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), endptno)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); } @@ -860,7 +856,6 @@ USB_DETACH(ugen) int maj, mn; #elif defined(__FreeBSD__) dev_t dev; - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -901,9 +896,6 @@ USB_DETACH(ugen) #elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), 0)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); ugen_destroy_devnodes(sc); #endif diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 57f8e2904659..1a2c42bd2694 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -304,8 +304,6 @@ USB_DETACH(uhid) int s; #if defined(__NetBSD__) || defined(__OpenBSD__) int maj, mn; -#elif defined(__FreeBSD__) - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -339,10 +337,6 @@ USB_DETACH(uhid) mn = self->dv_unit; vdevgone(maj, mn, mn, VCHR); #elif defined(__FreeBSD__) - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->dev); #endif diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 46a452ccd6e3..6df5ff3a2fe3 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/uio.h> #include <sys/conf.h> -#include <sys/vnode.h> #include <sys/syslog.h> #include <sys/sysctl.h> @@ -376,8 +375,6 @@ USB_DETACH(ulpt) int s; #if defined(__NetBSD__) || defined(__OpenBSD__) int maj, mn; -#elif defined(__FreeBSD__) - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -414,13 +411,6 @@ USB_DETACH(ulpt) mn = self->dv_unit; vdevgone(maj, mn, mn, VCHR); #elif defined(__FreeBSD__) - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - vp = SLIST_FIRST(&sc->dev_noprime->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->dev); destroy_dev(sc->dev_noprime); #endif diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 72240bf6b575..d3acf92e514a 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -367,7 +367,6 @@ Static int ums_detach(device_t self) { struct ums_softc *sc = device_get_softc(self); - struct vnode *vp; if (sc->sc_enabled) ums_disable(sc); @@ -377,10 +376,6 @@ ums_detach(device_t self) free(sc->sc_loc_btn, M_USB); free(sc->sc_ibuf, M_USB); - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - /* someone waiting for data */ /* * XXX If we wakeup the process here, the device will be gone by diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 8615d9a8fd36..5d82960f427c 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -620,7 +620,6 @@ USB_DETACH(uscanner) int maj, mn; #elif defined(__FreeBSD__) dev_t dev; - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -657,9 +656,6 @@ USB_DETACH(uscanner) #elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ dev = makedev(USCANNER_CDEV_MAJOR, USBDEVUNIT(sc->sc_dev)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); #endif |