Skip to content

Commit

Permalink
Clean-up usbd_abort_pipe() usage.
Browse files Browse the repository at this point in the history 
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@
  • Loading branch information
@pirofti
pirofti committed Nov 15, 2013
1 parent 77abe8f commit 1e087f7
Show file tree
Hide file tree
Showing 25 changed files with 78 additions and 262 deletions.
14 changes: 3 additions & 11 deletions sys/dev/usb/if_atu.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_atu.c,v 1.103 2013/04/15 09:23:01 mglocker Exp $ */
/* $OpenBSD: if_atu.c,v 1.104 2013/11/15 10:17:39 pirofti Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
Expand Down Expand Up @@ -2301,11 +2301,7 @@ atu_stop(struct ifnet *ifp, int disable)

/* Stop transfers. */
if (sc->atu_ep[ATU_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->atu_ep[ATU_ENDPT_RX]);
if (err) {
DPRINTF(("%s: abort rx pipe failed: %s\n",
sc->atu_dev.dv_xname, usbd_errstr(err)));
}
usbd_abort_pipe(sc->atu_ep[ATU_ENDPT_RX]);
err = usbd_close_pipe(sc->atu_ep[ATU_ENDPT_RX]);
if (err) {
DPRINTF(("%s: close rx pipe failed: %s\n",
Expand All @@ -2315,11 +2311,7 @@ atu_stop(struct ifnet *ifp, int disable)
}

if (sc->atu_ep[ATU_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->atu_ep[ATU_ENDPT_TX]);
if (err) {
DPRINTF(("%s: abort tx pipe failed: %s\n",
sc->atu_dev.dv_xname, usbd_errstr(err)));
}
usbd_abort_pipe(sc->atu_ep[ATU_ENDPT_TX]);
err = usbd_close_pipe(sc->atu_ep[ATU_ENDPT_TX]);
if (err) {
DPRINTF(("%s: close tx pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_aue.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_aue.c,v 1.89 2013/11/05 10:20:04 mpi Exp $ */
/* $OpenBSD: if_aue.c,v 1.90 2013/11/15 10:17:39 pirofti Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
Expand Down Expand Up @@ -1604,11 +1604,7 @@ aue_stop(struct aue_softc *sc)

/* Stop transfers. */
if (sc->aue_ep[AUE_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_RX]);
if (err) {
printf("%s: abort rx pipe failed: %s\n",
sc->aue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_RX]);
err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_RX]);
if (err) {
printf("%s: close rx pipe failed: %s\n",
Expand All @@ -1618,11 +1614,7 @@ aue_stop(struct aue_softc *sc)
}

if (sc->aue_ep[AUE_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_TX]);
if (err) {
printf("%s: abort tx pipe failed: %s\n",
sc->aue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_TX]);
err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_TX]);
if (err) {
printf("%s: close tx pipe failed: %s\n",
Expand All @@ -1632,11 +1624,7 @@ aue_stop(struct aue_softc *sc)
}

if (sc->aue_ep[AUE_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_INTR]);
if (err) {
printf("%s: abort intr pipe failed: %s\n",
sc->aue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_INTR]);
err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_INTR]);
if (err) {
printf("%s: close intr pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_axe.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_axe.c,v 1.122 2013/08/07 01:06:41 bluhm Exp $ */
/* $OpenBSD: if_axe.c,v 1.123 2013/11/15 10:17:39 pirofti Exp $ */

/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
Expand Down Expand Up @@ -1500,11 +1500,7 @@ axe_stop(struct axe_softc *sc)

/* Stop transfers. */
if (sc->axe_ep[AXE_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_RX]);
if (err) {
printf("axe%d: abort rx pipe failed: %s\n",
sc->axe_unit, usbd_errstr(err));
}
usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_RX]);
err = usbd_close_pipe(sc->axe_ep[AXE_ENDPT_RX]);
if (err) {
printf("axe%d: close rx pipe failed: %s\n",
Expand All @@ -1514,11 +1510,7 @@ axe_stop(struct axe_softc *sc)
}

if (sc->axe_ep[AXE_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_TX]);
if (err) {
printf("axe%d: abort tx pipe failed: %s\n",
sc->axe_unit, usbd_errstr(err));
}
usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_TX]);
err = usbd_close_pipe(sc->axe_ep[AXE_ENDPT_TX]);
if (err) {
printf("axe%d: close tx pipe failed: %s\n",
Expand All @@ -1528,11 +1520,7 @@ axe_stop(struct axe_softc *sc)
}

if (sc->axe_ep[AXE_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_INTR]);
if (err) {
printf("axe%d: abort intr pipe failed: %s\n",
sc->axe_unit, usbd_errstr(err));
}
usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_INTR]);
err = usbd_close_pipe(sc->axe_ep[AXE_ENDPT_INTR]);
if (err) {
printf("axe%d: close intr pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_axen.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/* $OpenBSD: if_axen.c,v 1.4 2013/11/15 10:17:39 pirofti Exp $ */

/*
* Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
Expand Down Expand Up @@ -1510,11 +1510,7 @@ axen_stop(struct axen_softc *sc)

/* Stop transfers. */
if (sc->axen_ep[AXEN_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_RX]);
if (err) {
printf("axen%d: abort rx pipe failed: %s\n",
sc->axen_unit, usbd_errstr(err));
}
usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_RX]);
err = usbd_close_pipe(sc->axen_ep[AXEN_ENDPT_RX]);
if (err) {
printf("axen%d: close rx pipe failed: %s\n",
Expand All @@ -1524,11 +1520,7 @@ axen_stop(struct axen_softc *sc)
}

if (sc->axen_ep[AXEN_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_TX]);
if (err) {
printf("axen%d: abort tx pipe failed: %s\n",
sc->axen_unit, usbd_errstr(err));
}
usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_TX]);
err = usbd_close_pipe(sc->axen_ep[AXEN_ENDPT_TX]);
if (err) {
printf("axen%d: close tx pipe failed: %s\n",
Expand All @@ -1538,11 +1530,7 @@ axen_stop(struct axen_softc *sc)
}

if (sc->axen_ep[AXEN_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_INTR]);
if (err) {
printf("axen%d: abort intr pipe failed: %s\n",
sc->axen_unit, usbd_errstr(err));
}
usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_INTR]);
err = usbd_close_pipe(sc->axen_ep[AXEN_ENDPT_INTR]);
if (err) {
printf("axen%d: close intr pipe failed: %s\n",
Expand Down
17 changes: 4 additions & 13 deletions sys/dev/usb/if_cdce.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_cdce.c,v 1.56 2013/11/11 12:38:16 pirofti Exp $ */
/* $OpenBSD: if_cdce.c,v 1.57 2013/11/15 10:17:39 pirofti Exp $ */

/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
Expand Down Expand Up @@ -463,10 +463,7 @@ cdce_stop(struct cdce_softc *sc)
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);

if (sc->cdce_bulkin_pipe != NULL) {
err = usbd_abort_pipe(sc->cdce_bulkin_pipe);
if (err)
printf("%s: abort rx pipe failed: %s\n",
sc->cdce_dev.dv_xname, usbd_errstr(err));
usbd_abort_pipe(sc->cdce_bulkin_pipe);
err = usbd_close_pipe(sc->cdce_bulkin_pipe);
if (err)
printf("%s: close rx pipe failed: %s\n",
Expand All @@ -475,10 +472,7 @@ cdce_stop(struct cdce_softc *sc)
}

if (sc->cdce_bulkout_pipe != NULL) {
err = usbd_abort_pipe(sc->cdce_bulkout_pipe);
if (err)
printf("%s: abort tx pipe failed: %s\n",
sc->cdce_dev.dv_xname, usbd_errstr(err));
usbd_abort_pipe(sc->cdce_bulkout_pipe);
err = usbd_close_pipe(sc->cdce_bulkout_pipe);
if (err)
printf("%s: close tx pipe failed: %s\n",
Expand All @@ -487,10 +481,7 @@ cdce_stop(struct cdce_softc *sc)
}

if (sc->cdce_intr_pipe != NULL) {
err = usbd_abort_pipe(sc->cdce_intr_pipe);
if (err)
printf("%s: abort interrupt pipe failed: %s\n",
sc->cdce_dev.dv_xname, usbd_errstr(err));
usbd_abort_pipe(sc->cdce_intr_pipe);
err = usbd_close_pipe(sc->cdce_intr_pipe);
if (err)
printf("%s: close interrupt pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_cue.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_cue.c,v 1.63 2013/11/05 10:20:04 mpi Exp $ */
/* $OpenBSD: if_cue.c,v 1.64 2013/11/15 10:17:39 pirofti Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
Expand Down Expand Up @@ -1190,11 +1190,7 @@ cue_stop(struct cue_softc *sc)

/* Stop transfers. */
if (sc->cue_ep[CUE_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_RX]);
if (err) {
printf("%s: abort rx pipe failed: %s\n",
sc->cue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_RX]);
err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_RX]);
if (err) {
printf("%s: close rx pipe failed: %s\n",
Expand All @@ -1204,11 +1200,7 @@ cue_stop(struct cue_softc *sc)
}

if (sc->cue_ep[CUE_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]);
if (err) {
printf("%s: abort tx pipe failed: %s\n",
sc->cue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]);
err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_TX]);
if (err) {
printf("%s: close tx pipe failed: %s\n",
Expand All @@ -1218,11 +1210,7 @@ cue_stop(struct cue_softc *sc)
}

if (sc->cue_ep[CUE_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
if (err) {
printf("%s: abort intr pipe failed: %s\n",
sc->cue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
if (err) {
printf("%s: close intr pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_kue.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_kue.c,v 1.70 2013/11/11 12:38:39 pirofti Exp $ */
/* $OpenBSD: if_kue.c,v 1.71 2013/11/15 10:17:39 pirofti Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
Expand Down Expand Up @@ -1154,11 +1154,7 @@ kue_stop(struct kue_softc *sc)

/* Stop transfers. */
if (sc->kue_ep[KUE_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_RX]);
if (err) {
printf("%s: abort rx pipe failed: %s\n",
sc->kue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_RX]);
err = usbd_close_pipe(sc->kue_ep[KUE_ENDPT_RX]);
if (err) {
printf("%s: close rx pipe failed: %s\n",
Expand All @@ -1168,11 +1164,7 @@ kue_stop(struct kue_softc *sc)
}

if (sc->kue_ep[KUE_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_TX]);
if (err) {
printf("%s: abort tx pipe failed: %s\n",
sc->kue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_TX]);
err = usbd_close_pipe(sc->kue_ep[KUE_ENDPT_TX]);
if (err) {
printf("%s: close tx pipe failed: %s\n",
Expand All @@ -1182,11 +1174,7 @@ kue_stop(struct kue_softc *sc)
}

if (sc->kue_ep[KUE_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_INTR]);
if (err) {
printf("%s: abort intr pipe failed: %s\n",
sc->kue_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_INTR]);
err = usbd_close_pipe(sc->kue_ep[KUE_ENDPT_INTR]);
if (err) {
printf("%s: close intr pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_mos.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_mos.c,v 1.21 2013/08/07 01:06:41 bluhm Exp $ */
/* $OpenBSD: if_mos.c,v 1.22 2013/11/15 10:17:39 pirofti Exp $ */

/*
* Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
Expand Down Expand Up @@ -1378,11 +1378,7 @@ mos_stop(struct mos_softc *sc)

/* Stop transfers. */
if (sc->mos_ep[MOS_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_RX]);
if (err) {
printf("%s: abort rx pipe failed: %s\n",
sc->mos_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_RX]);
err = usbd_close_pipe(sc->mos_ep[MOS_ENDPT_RX]);
if (err) {
printf("%s: close rx pipe failed: %s\n",
Expand All @@ -1392,11 +1388,7 @@ mos_stop(struct mos_softc *sc)
}

if (sc->mos_ep[MOS_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_TX]);
if (err) {
printf("%s: abort tx pipe failed: %s\n",
sc->mos_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_TX]);
err = usbd_close_pipe(sc->mos_ep[MOS_ENDPT_TX]);
if (err) {
printf("%s: close tx pipe failed: %s\n",
Expand All @@ -1406,11 +1398,7 @@ mos_stop(struct mos_softc *sc)
}

if (sc->mos_ep[MOS_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_INTR]);
if (err) {
printf("%s: abort intr pipe failed: %s\n",
sc->mos_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_INTR]);
err = usbd_close_pipe(sc->mos_ep[MOS_ENDPT_INTR]);
if (err) {
printf("%s: close intr pipe failed: %s\n",
Expand Down
20 changes: 4 additions & 16 deletions sys/dev/usb/if_smsc.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: if_smsc.c,v 1.9 2013/08/07 01:06:42 bluhm Exp $ */
/* $OpenBSD: if_smsc.c,v 1.10 2013/11/15 10:17:39 pirofti Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
/*-
* Copyright (c) 2012
Expand Down Expand Up @@ -670,11 +670,7 @@ smsc_stop(struct smsc_softc *sc)

/* Stop transfers. */
if (sc->sc_ep[SMSC_ENDPT_RX] != NULL) {
err = usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_RX]);
if (err) {
printf("%s: abort rx pipe failed: %s\n",
sc->sc_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_RX]);
err = usbd_close_pipe(sc->sc_ep[SMSC_ENDPT_RX]);
if (err) {
printf("%s: close rx pipe failed: %s\n",
Expand All @@ -684,11 +680,7 @@ smsc_stop(struct smsc_softc *sc)
}

if (sc->sc_ep[SMSC_ENDPT_TX] != NULL) {
err = usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_TX]);
if (err) {
printf("%s: abort tx pipe failed: %s\n",
sc->sc_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_TX]);
err = usbd_close_pipe(sc->sc_ep[SMSC_ENDPT_TX]);
if (err) {
printf("%s: close tx pipe failed: %s\n",
Expand All @@ -698,11 +690,7 @@ smsc_stop(struct smsc_softc *sc)
}

if (sc->sc_ep[SMSC_ENDPT_INTR] != NULL) {
err = usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_INTR]);
if (err) {
printf("%s: abort intr pipe failed: %s\n",
sc->sc_dev.dv_xname, usbd_errstr(err));
}
usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_INTR]);
err = usbd_close_pipe(sc->sc_ep[SMSC_ENDPT_INTR]);
if (err) {
printf("%s: close intr pipe failed: %s\n",
Expand Down

0 comments on commit 1e087f7

Please sign in to comment.