From ee0f444043f62b1989c63b9419c2e908f6c4793f Mon Sep 17 00:00:00 2001 From: Marc Balmer Date: Sun, 10 Jun 2007 10:53:50 +0000 Subject: Remove the definition and use of the USBDEV macro. It only created confusion and the address of it's argument: USBDEV(sc->sc_dev) yields &sc->sc_dev. No binary changes. ok jsg. --- sys/dev/usb/ulpt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/dev/usb/ulpt.c') diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index aff35c321c8..f89d2b1495d 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.25 2007/06/06 19:25:49 mk Exp $ */ +/* $OpenBSD: ulpt.c,v 1.26 2007/06/10 10:53:48 mbalmer Exp $ */ /* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -294,7 +294,7 @@ ulpt_attach(struct device *parent, struct device *self, void *aux) } #endif usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + &sc->sc_dev); } int @@ -332,7 +332,7 @@ ulpt_detach(struct device *self, int flags) 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); @@ -347,7 +347,7 @@ ulpt_detach(struct device *self, int flags) vdevgone(maj, mn | ULPT_NOPRIME , mn | ULPT_NOPRIME, VCHR); usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + &sc->sc_dev); return (0); } @@ -510,7 +510,7 @@ ulptopen(dev_t 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); @@ -621,7 +621,7 @@ ulptwrite(dev_t 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); } -- cgit v1.2.3