summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/if_udav.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/if_udav.c')
-rw-r--r--sys/dev/usb/if_udav.c31
1 files changed, 15 insertions, 16 deletions
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
OpenPOWER on IntegriCloud