diff options
| author | imp <imp@FreeBSD.org> | 2007-06-12 16:52:07 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2007-06-12 16:52:07 +0000 |
| commit | e834ae963f8522bce24ae081eba547b68f85ded1 (patch) | |
| tree | 396db1f2e448e6e195fd08a0ede25fb41109414c /sys/dev/usb/ulpt.c | |
| parent | fc9cb03e61e12e2da0f587a3fdccfdd9367dda86 (diff) | |
| download | FreeBSD-src-e834ae963f8522bce24ae081eba547b68f85ded1.zip FreeBSD-src-e834ae963f8522bce24ae081eba547b68f85ded1.tar.gz | |
Remove USBDEV() macro. We do not need a macro that is defined as its
only argument. It was used inconsistently in the tree, so remove it.
Diffstat (limited to 'sys/dev/usb/ulpt.c')
| -rw-r--r-- | sys/dev/usb/ulpt.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index dc39028..7a78d81 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -329,8 +329,7 @@ USB_ATTACH(ulpt) device_get_unit(self)|ULPT_NOPRIME, UID_ROOT, GID_OPERATOR, 0644, "unlpt%d", device_get_unit(self)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return 0; } @@ -353,15 +352,14 @@ USB_DETACH(ulpt) if (--sc->sc_refcnt >= 0) { /* There is noone to wake, aborting the pipe is enough */ /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); + usb_detach_wait(sc->sc_dev); } splx(s); destroy_dev(sc->dev); destroy_dev(sc->dev_noprime); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (0); } @@ -538,7 +536,7 @@ ulptopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p) done: if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(sc->sc_dev); DPRINTF(("ulptopen: done, error=%d\n", error)); return (error); @@ -649,7 +647,7 @@ ulptwrite(struct cdev *dev, struct uio *uio, int flags) sc->sc_refcnt++; error = ulpt_do_write(sc, uio, flags); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(sc->sc_dev); return (error); } @@ -704,7 +702,7 @@ ulptread(struct cdev *dev, struct uio *uio, int flags) sc->sc_refcnt++; error = ulpt_do_read(sc, uio, flags); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(sc->sc_dev); return (error); } |
