summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/if_udav.c
diff options
context:
space:
mode:
authorpirofti <pirofti@openbsd.org>2013-11-15 10:17:39 +0000
committerpirofti <pirofti@openbsd.org>2013-11-15 10:17:39 +0000
commit1e087f7cf25ce711b6cef28d054ab4a68be213d2 (patch)
tree82a2593c7a472c02bcb435788d5725f6acc6d415 /sys/dev/usb/if_udav.c
parentSort-out activate functionality for ucom(4) and it's parents. (diff)
downloadwireguard-openbsd-1e087f7cf25ce711b6cef28d054ab4a68be213d2.tar.xz
wireguard-openbsd-1e087f7cf25ce711b6cef28d054ab4a68be213d2.zip
Clean-up usbd_abort_pipe() usage.
This function never fails. So change it's return type to void and adjust the copy-pasted callers that were checking the return. "If it compiles, ok" mpi@
Diffstat (limited to 'sys/dev/usb/if_udav.c')
-rw-r--r--sys/dev/usb/if_udav.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 0847dbe7146..b65ac2d2c27 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.63 2013/08/07 01:06:42 bluhm Exp $ */
+/* $OpenBSD: if_udav.c,v 1.64 2013/11/15 10:17:39 pirofti Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -1274,10 +1274,7 @@ udav_stop(struct ifnet *ifp, int disable)
/* Stop transfers */
/* RX endpoint */
if (sc->sc_pipe_rx != NULL) {
- err = usbd_abort_pipe(sc->sc_pipe_rx);
- if (err)
- printf("%s: abort rx pipe failed: %s\n",
- sc->sc_dev.dv_xname, usbd_errstr(err));
+ usbd_abort_pipe(sc->sc_pipe_rx);
err = usbd_close_pipe(sc->sc_pipe_rx);
if (err)
printf("%s: close rx pipe failed: %s\n",
@@ -1287,10 +1284,7 @@ udav_stop(struct ifnet *ifp, int disable)
/* TX endpoint */
if (sc->sc_pipe_tx != NULL) {
- err = usbd_abort_pipe(sc->sc_pipe_tx);
- if (err)
- printf("%s: abort tx pipe failed: %s\n",
- sc->sc_dev.dv_xname, usbd_errstr(err));
+ usbd_abort_pipe(sc->sc_pipe_tx);
err = usbd_close_pipe(sc->sc_pipe_tx);
if (err)
printf("%s: close tx pipe failed: %s\n",
@@ -1302,10 +1296,7 @@ udav_stop(struct ifnet *ifp, int disable)
/* XXX: Interrupt endpoint is not yet supported!! */
/* Interrupt endpoint */
if (sc->sc_pipe_intr != NULL) {
- err = usbd_abort_pipe(sc->sc_pipe_intr);
- if (err)
- printf("%s: abort intr pipe failed: %s\n",
- sc->sc_dev.dv_xname, usbd_errstr(err));
+ usbd_abort_pipe(sc->sc_pipe_intr);
err = usbd_close_pipe(sc->sc_pipe_intr);
if (err)
printf("%s: close intr pipe failed: %s\n",