diff options
author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 10:53:50 +0000 |
---|---|---|
committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 10:53:50 +0000 |
commit | ee0f444043f62b1989c63b9419c2e908f6c4793f (patch) | |
tree | 7d1c958fdcad64480efcbfb6f0ea69602208ab47 /sys/dev/usb/uscanner.c | |
parent | ba9346211f99b37c96aa619b9981b230c7b4a61d (diff) |
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.
Diffstat (limited to 'sys/dev/usb/uscanner.c')
-rw-r--r-- | sys/dev/usb/uscanner.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index ae4c24a59d5..c6c93c696eb 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.27 2007/06/06 19:25:50 mk Exp $ */ +/* $OpenBSD: uscanner.c,v 1.28 2007/06/10 10:53:49 mbalmer Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -320,7 +320,7 @@ uscanner_attach(struct device *parent, struct device *self, void *aux) sc->sc_bulkout = ed_bulkout->bEndpointAddress; usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + &sc->sc_dev); } int @@ -495,7 +495,7 @@ uscannerread(dev_t dev, struct uio *uio, int flag) sc->sc_refcnt++; error = uscanner_do_read(sc, uio, flag); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(&sc->sc_dev); return (error); } @@ -545,7 +545,7 @@ uscannerwrite(dev_t dev, struct uio *uio, int flag) sc->sc_refcnt++; error = uscanner_do_write(sc, uio, flag); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(&sc->sc_dev); return (error); } @@ -586,7 +586,7 @@ uscanner_detach(struct device *self, int flags) s = splusb(); if (--sc->sc_refcnt >= 0) { /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); + usb_detach_wait(&sc->sc_dev); } splx(s); @@ -599,7 +599,7 @@ uscanner_detach(struct device *self, int flags) mn = self->dv_unit * USB_MAX_ENDPOINTS; vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + &sc->sc_dev); return (0); } |