From owner-p4-projects@FreeBSD.ORG Mon Apr 30 20:06:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9437E16A407; Mon, 30 Apr 2007 20:06:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5900716A400 for ; Mon, 30 Apr 2007 20:06:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 49B0313C457 for ; Mon, 30 Apr 2007 20:06:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3UK6MjJ083564 for ; Mon, 30 Apr 2007 20:06:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3UK6LH8083561 for perforce@freebsd.org; Mon, 30 Apr 2007 20:06:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 30 Apr 2007 20:06:21 GMT Message-Id: <200704302006.l3UK6LH8083561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 119019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2007 20:06:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=119019 Change 119019 by hselasky@hselasky_mini_itx on 2007/04/30 20:05:35 usbd_transfer_stop() is NULL safe now. Take advantage of this to reduce amount of code. Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#14 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#10 (text+ko) ==== @@ -1555,14 +1555,8 @@ #if (UAUDIO_NCHANBUFS != 2) #error "please update code" #endif - - if (ch->xfer[0]) { - usbd_transfer_stop(ch->xfer[0]); - } - - if (ch->xfer[1]) { - usbd_transfer_stop(ch->xfer[1]); - } + usbd_transfer_stop(ch->xfer[0]); + usbd_transfer_stop(ch->xfer[1]); return 0; } @@ -3860,12 +3854,8 @@ mtx_lock(&(chan->mtx)); - if (chan->xfer[3]) { - usbd_transfer_stop(chan->xfer[3]); - } - if (chan->xfer[1]) { - usbd_transfer_stop(chan->xfer[1]); - } + usbd_transfer_stop(chan->xfer[3]); + usbd_transfer_stop(chan->xfer[1]); mtx_unlock(&(chan->mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#22 (text+ko) ==== @@ -1633,24 +1633,12 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - if (sc->sc_xfer[4]) { - usbd_transfer_stop(sc->sc_xfer[4]); - } - if (sc->sc_xfer[5]) { - usbd_transfer_stop(sc->sc_xfer[5]); - } + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[4]); + usbd_transfer_stop(sc->sc_xfer[5]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#21 (text+ko) ==== @@ -1588,24 +1588,12 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - if (sc->sc_xfer[4]) { - usbd_transfer_stop(sc->sc_xfer[4]); - } - if (sc->sc_xfer[5]) { - usbd_transfer_stop(sc->sc_xfer[5]); - } + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[4]); + usbd_transfer_stop(sc->sc_xfer[5]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#14 (text+ko) ==== @@ -605,19 +605,10 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#17 (text+ko) ==== @@ -1034,18 +1034,10 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#19 (text+ko) ==== @@ -1053,18 +1053,10 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#18 (text+ko) ==== @@ -1458,24 +1458,12 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - if (sc->sc_xfer[4]) { - usbd_transfer_stop(sc->sc_xfer[4]); - } - if (sc->sc_xfer[5]) { - usbd_transfer_stop(sc->sc_xfer[5]); - } + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[4]); + usbd_transfer_stop(sc->sc_xfer[5]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#18 (text+ko) ==== @@ -1249,24 +1249,12 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - if (sc->sc_xfer[4]) { - usbd_transfer_stop(sc->sc_xfer[4]); - } - if (sc->sc_xfer[5]) { - usbd_transfer_stop(sc->sc_xfer[5]); - } + usbd_transfer_stop(sc->sc_xfer[0]); + usbd_transfer_stop(sc->sc_xfer[1]); + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[4]); + usbd_transfer_stop(sc->sc_xfer[5]); return; } ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#9 (text+ko) ==== @@ -2826,19 +2826,10 @@ /* stop all the transfers, * if not already stopped: */ - if (sc->sc_xfer[ZYD_TR_BULK_DT_WR]) { - usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_DT_WR]); - } - if (sc->sc_xfer[ZYD_TR_BULK_DT_RD]) { - usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_DT_RD]); - } - if (sc->sc_xfer[ZYD_TR_BULK_CS_WR]) { - usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_CS_WR]); - } - if (sc->sc_xfer[ZYD_TR_BULK_CS_RD]) { - usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_CS_RD]); - } - + usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_DT_WR]); + usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_CS_WR]); + usbd_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_CS_RD]); return; } ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#12 (text+ko) ==== @@ -365,9 +365,7 @@ */ mtx_lock(&Giant); for (n = 0; n < UBSER_TR_MAX; n++) { - if (sc->sc_xfer[n]) { - usbd_transfer_stop(sc->sc_xfer[n]); - } + usbd_transfer_stop(sc->sc_xfer[n]); } mtx_unlock(&Giant); ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#14 (text+ko) ==== @@ -530,23 +530,11 @@ sce->state |= UGEN_CLOSING; - if(sce->xfer_in[0]) - { - usbd_transfer_stop(sce->xfer_in[0]); - } - if(sce->xfer_in[1]) - { - usbd_transfer_stop(sce->xfer_in[1]); - } - if(sce->xfer_out[0]) - { - usbd_transfer_stop(sce->xfer_out[0]); - } - if(sce->xfer_out[1]) - { - usbd_transfer_stop(sce->xfer_out[1]); - } - + usbd_transfer_stop(sce->xfer_in[0]); + usbd_transfer_stop(sce->xfer_in[1]); + usbd_transfer_stop(sce->xfer_out[0]); + usbd_transfer_stop(sce->xfer_out[1]); + while(sce->state & (UGEN_RD_CFG|UGEN_RD_SLP|UGEN_RD_WUP|UGEN_RD_UIO| UGEN_WR_CFG|UGEN_WR_SLP|UGEN_WR_WUP|UGEN_WR_UIO| ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 (text+ko) ====