summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/usb/if_cdce.c4
-rw-r--r--sys/dev/usb/if_udav.c31
-rw-r--r--sys/dev/usb/ubser.c4
-rw-r--r--sys/dev/usb/uftdi.c2
-rw-r--r--sys/dev/usb/uhid.c8
-rw-r--r--sys/dev/usb/uhub.c9
-rw-r--r--sys/dev/usb/ulpt.c14
-rw-r--r--sys/dev/usb/urio.c10
-rw-r--r--sys/dev/usb/usb.c2
-rw-r--r--sys/dev/usb/usb_port.h1
-rw-r--r--sys/dev/usb/uscanner.c12
-rw-r--r--sys/dev/usb/uvisor.c4
12 files changed, 46 insertions, 55 deletions
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index cb01b6f..de7a0b6 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -312,7 +312,7 @@ USB_ATTACH(cdce)
CDCE_UNLOCK(sc);
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->cdce_udev,
- USBDEV(sc->cdce_dev));
+ sc->cdce_dev);
return 0;
}
@@ -335,7 +335,7 @@ USB_DETACH(cdce)
mtx_destroy(&sc->cdce_mtx);
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->cdce_udev,
- USBDEV(sc->cdce_dev));
+ sc->cdce_dev);
return (0);
}
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 4908057..0932007 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -470,7 +470,7 @@ USB_ATTACH(udav)
UDAV_UNLOCK(sc);
#endif
- usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, USBDEV(sc->sc_dev));
+ usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, sc->sc_dev);
return 0;
@@ -510,7 +510,7 @@ USB_DETACH(udav)
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away */
- usb_detach_wait(USBDEV(sc->sc_dev));
+ usb_detach_wait(sc->sc_dev);
}
#if defined(__FreeBSD__)
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
@@ -557,8 +557,7 @@ USB_DETACH(udav)
mtx_destroy(&sc->sc_mtx);
#endif
- 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);
}
@@ -591,7 +590,7 @@ udav_mem_read(struct udav_softc *sc, int offset, void *buf, int len)
sc->sc_refcnt++;
err = usbd_do_request(sc->sc_udev, &req, buf);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err) {
DPRINTF(("%s: %s: read failed. off=%04x, err=%d\n",
device_get_nameunit(sc->sc_dev), __func__, offset, err));
@@ -628,7 +627,7 @@ udav_mem_write(struct udav_softc *sc, int offset, void *buf, int len)
sc->sc_refcnt++;
err = usbd_do_request(sc->sc_udev, &req, buf);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
device_get_nameunit(sc->sc_dev), __func__, offset, err));
@@ -664,7 +663,7 @@ udav_mem_write1(struct udav_softc *sc, int offset, unsigned char ch)
sc->sc_refcnt++;
err = usbd_do_request(sc->sc_udev, &req, NULL);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
device_get_nameunit(sc->sc_dev), __func__, offset, err));
@@ -702,7 +701,7 @@ udav_csr_read(struct udav_softc *sc, int offset, void *buf, int len)
sc->sc_refcnt++;
err = usbd_do_request(sc->sc_udev, &req, buf);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err) {
DPRINTF(("%s: %s: read failed. off=%04x, err=%d\n",
device_get_nameunit(sc->sc_dev), __func__, offset, err));
@@ -739,7 +738,7 @@ udav_csr_write(struct udav_softc *sc, int offset, void *buf, int len)
sc->sc_refcnt++;
err = usbd_do_request(sc->sc_udev, &req, buf);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
device_get_nameunit(sc->sc_dev), __func__, offset, err));
@@ -792,7 +791,7 @@ udav_csr_write1(struct udav_softc *sc, int offset, unsigned char ch)
sc->sc_refcnt++;
err = usbd_do_request(sc->sc_udev, &req, NULL);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
device_get_nameunit(sc->sc_dev), __func__, offset, err));
@@ -1129,7 +1128,7 @@ udav_openpipes(struct udav_softc *sc)
done:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
return (error);
}
@@ -1226,7 +1225,7 @@ udav_send(struct udav_softc *sc, struct mbuf *m, int idx)
sc->sc_refcnt++;
err = usbd_transfer(c->ue_xfer);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
if (err != USBD_IN_PROGRESS) {
printf("%s: udav_send error=%s\n", device_get_nameunit(sc->sc_dev),
usbd_errstr(err));
@@ -1287,7 +1286,7 @@ udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_refcnt++;
usbd_clear_endpoint_stall(sc->sc_pipe_tx);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
}
#if defined(__NetBSD__)
splx(s);
@@ -1348,7 +1347,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_refcnt++;
usbd_clear_endpoint_stall(sc->sc_pipe_rx);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
}
goto done;
}
@@ -1433,7 +1432,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_refcnt++;
usbd_transfer(xfer);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
DPRINTF(("%s: %s: start rx\n", device_get_nameunit(sc->sc_dev), __func__));
}
@@ -1788,7 +1787,7 @@ udav_unlock_mii(struct udav_softc *sc)
lockmgr(&sc->sc_mii_lock, LK_RELEASE, NULL, NULL);
#endif
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
}
static int
diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index eb2bdb9..b6b23a2 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -443,7 +443,7 @@ USB_DETACH(ubser)
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_wait(USBDEV(sc->sc_dev));
+ usb_detach_wait(sc->sc_dev);
}
return (0);
@@ -829,7 +829,7 @@ ubserclose(struct tty *tp)
pp = tp->t_sc;
sc = pp->p_sc;
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
}
static void
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index f82bf8a..6592261 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -353,7 +353,7 @@ USB_ATTACH(uftdi)
ucom->sc_callback = &uftdi_callback;
#if 0
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, ucom->sc_udev,
- USBDEV(ucom->sc_dev));
+ ucom->sc_dev);
#endif
DPRINTF(("uftdi: in=0x%x out=0x%x\n", ucom->sc_bulkin_no, ucom->sc_bulkout_no));
ucom_attach(&sc->sc_ucom);
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 4d0a9b1..0064c67 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -359,7 +359,7 @@ USB_DETACH(uhid)
/* Wake everyone */
wakeup(&sc->sc_q);
/* Wait for processes to go away. */
- usb_detach_wait(USBDEV(sc->sc_dev));
+ usb_detach_wait(sc->sc_dev);
}
splx(s);
}
@@ -571,7 +571,7 @@ uhidread(struct cdev *dev, struct uio *uio, int flag)
sc->sc_refcnt++;
error = uhid_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);
}
@@ -617,7 +617,7 @@ uhidwrite(struct cdev *dev, struct uio *uio, int flag)
sc->sc_refcnt++;
error = uhid_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);
}
@@ -747,7 +747,7 @@ uhidioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
sc->sc_refcnt++;
error = uhid_do_ioctl(sc, cmd, addr, flag, p);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
+ usb_detach_wakeup(sc->sc_dev);
return (error);
}
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 02c252f..79749d5 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -269,7 +269,7 @@ uhub_attach(device_t self)
/* Wait with power off for a while. */
usbd_delay_ms(dev, USB_POWER_DOWN_TIME);
- usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, USBDEV(sc->sc_dev));
+ usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, sc->sc_dev);
/*
* To have the best chance of success we do things in the exact same
@@ -440,7 +440,7 @@ uhub_explore(usbd_device_handle dev)
/* Disconnected */
DPRINTF(("uhub_explore: device addr=%d disappeared "
"on port %d\n", up->device->address, port));
- usb_disconnect_port(up, USBDEV(sc->sc_dev));
+ usb_disconnect_port(up, sc->sc_dev);
usbd_clear_port_feature(dev, port,
UHF_C_PORT_CONNECTION);
}
@@ -501,7 +501,7 @@ uhub_explore(usbd_device_handle dev)
else
speed = USB_SPEED_FULL;
/* Get device info and set its address. */
- err = usbd_new_device(USBDEV(sc->sc_dev), dev->bus,
+ err = usbd_new_device(sc->sc_dev, dev->bus,
dev->depth + 1, speed, port, up);
/* XXX retry a few times? */
if (err) {
@@ -555,8 +555,7 @@ USB_DETACH(uhub)
usb_disconnect_port(rup, self);
}
- usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_hub,
- USBDEV(sc->sc_dev));
+ usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_hub, sc->sc_dev);
if (hub->ports[0].tt)
free(hub->ports[0].tt, M_USBDEV);
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);
}
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 6594c6a..d17f017 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -256,8 +256,7 @@ USB_ATTACH(urio)
UID_ROOT, GID_OPERATOR,
0644, "urio%d", device_get_unit(self));
#elif defined(__NetBSD__) || defined(__OpenBSD__)
- 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);
#endif
DPRINTFN(10, ("urio_attach: %p\n", sc->sc_udev));
@@ -624,7 +623,7 @@ USB_DETACH(urio)
for (i = 0; i < USB_MAX_ENDPOINTS; i++)
wakeup(&sc->sc_endpoints[i][IN]);
/* Wait for processes to go away. */
- usb_detach_wait(USBDEV(sc->sc_dev));
+ usb_detach_wait(sc->sc_dev);
}
splx(s);
#else
@@ -637,7 +636,7 @@ USB_DETACH(urio)
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);
#endif
@@ -653,8 +652,7 @@ USB_DETACH(urio)
vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR);
#endif
- 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);
}
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 0033e79..63df3c7 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -279,7 +279,7 @@ USB_ATTACH(usb)
#endif
#endif
- err = usbd_new_device(USBDEV(sc->sc_dev), sc->sc_bus, 0, speed, 0,
+ err = usbd_new_device(sc->sc_dev, sc->sc_bus, 0, speed, 0,
&sc->sc_port);
if (!err) {
dev = sc->sc_port.device;
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index e46e29a..faadeb1 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -71,7 +71,6 @@ MALLOC_DECLARE(M_USBHC);
#define USB_USE_SOFTINTR
#endif
-#define USBDEV(bdev) (bdev)
#define USBGETSOFTC(bdev) (device_get_softc(bdev))
typedef struct thread *usb_proc_ptr;
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index e521b89..2bfbd7d 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -377,8 +377,7 @@ USB_ATTACH(uscanner)
UID_ROOT, GID_OPERATOR, 0644, "%s", device_get_nameunit(sc->sc_dev));
#endif
- 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;
}
@@ -555,7 +554,7 @@ uscannerread(struct cdev *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);
}
@@ -605,7 +604,7 @@ uscannerwrite(struct cdev *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);
}
@@ -653,7 +652,7 @@ USB_DETACH(uscanner)
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);
@@ -671,8 +670,7 @@ USB_DETACH(uscanner)
destroy_dev(sc->dev);
#endif
- 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);
}
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 595cf9a..69288f4 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -362,7 +362,7 @@ USB_ATTACH(uvisor)
}
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, ucom->sc_udev,
- USBDEV(ucom->sc_dev));
+ ucom->sc_dev);
DPRINTF(("uvisor: in=0x%x out=0x%x\n", ucom->sc_bulkin_no, ucom->sc_bulkout_no));
ucom_attach(&sc->sc_ucom);
@@ -409,7 +409,7 @@ USB_DETACH(uvisor)
rv = ucom_detach(&sc->sc_ucom);
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_ucom.sc_udev,
- USBDEV(sc->sc_ucom.sc_dev));
+ sc->sc_ucom.sc_dev);
return (rv);
}
OpenPOWER on IntegriCloud