From owner-svn-src-head@FreeBSD.ORG Fri Sep 30 04:55:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F289106566C; Fri, 30 Sep 2011 04:55:24 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0579E8FC0A; Fri, 30 Sep 2011 04:55:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8U4tNxF053364; Fri, 30 Sep 2011 04:55:23 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8U4tNoP053355; Fri, 30 Sep 2011 04:55:23 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201109300455.p8U4tNoP053355@svn.freebsd.org> From: Kevin Lo Date: Fri, 30 Sep 2011 04:55:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225882 - in head/sys/arm: at91 econa X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2011 04:55:24 -0000 Author: kevlo Date: Fri Sep 30 04:55:23 2011 New Revision: 225882 URL: http://svn.freebsd.org/changeset/base/225882 Log: Remove pointless semicolons after label Modified: head/sys/arm/at91/at91_mci.c head/sys/arm/at91/at91_pio.c head/sys/arm/at91/at91_rtc.c head/sys/arm/at91/at91_spi.c head/sys/arm/at91/at91_ssc.c head/sys/arm/at91/at91_twi.c head/sys/arm/at91/uart_dev_at91usart.c head/sys/arm/econa/if_ece.c Modified: head/sys/arm/at91/at91_mci.c ============================================================================== --- head/sys/arm/at91/at91_mci.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/at91_mci.c Fri Sep 30 04:55:23 2011 (r225882) @@ -243,7 +243,7 @@ at91_mci_attach(device_t dev) child = device_add_child(dev, "mmc", 0); device_set_ivars(dev, &sc->host); err = bus_generic_attach(dev); -out:; +out: if (err) at91_mci_deactivate(dev); return (err); Modified: head/sys/arm/at91/at91_pio.c ============================================================================== --- head/sys/arm/at91/at91_pio.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/at91_pio.c Fri Sep 30 04:55:23 2011 (r225882) @@ -162,7 +162,7 @@ at91_pio_attach(device_t dev) goto out; } sc->cdev->si_drv1 = sc; -out:; +out: if (err) at91_pio_deactivate(dev); return (err); Modified: head/sys/arm/at91/at91_rtc.c ============================================================================== --- head/sys/arm/at91/at91_rtc.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/at91_rtc.c Fri Sep 30 04:55:23 2011 (r225882) @@ -118,7 +118,7 @@ at91_rtc_attach(device_t dev) goto out; } clock_register(dev, 1000000); -out:; +out: if (err) at91_rtc_deactivate(dev); return (err); Modified: head/sys/arm/at91/at91_spi.c ============================================================================== --- head/sys/arm/at91/at91_spi.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/at91_spi.c Fri Sep 30 04:55:23 2011 (r225882) @@ -134,7 +134,7 @@ at91_spi_attach(device_t dev) device_add_child(dev, "spibus", -1); bus_generic_attach(dev); -out:; +out: if (err) at91_spi_deactivate(dev); return (err); @@ -259,7 +259,7 @@ at91_spi_transfer(device_t dev, device_t for (j = 0; j < i; j++) bus_dmamap_unload(sc->dmatag, sc->map[j]); return (err); -out:; +out: for (j = 0; j < i; j++) bus_dmamap_unload(sc->dmatag, sc->map[j]); return (EIO); Modified: head/sys/arm/at91/at91_ssc.c ============================================================================== --- head/sys/arm/at91/at91_ssc.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/at91_ssc.c Fri Sep 30 04:55:23 2011 (r225882) @@ -150,7 +150,7 @@ at91_ssc_attach(device_t dev) WR4(sc, SSC_TFMR, 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_NEG_PULSE); -out:; +out: if (err) at91_ssc_deactivate(dev); return (err); Modified: head/sys/arm/at91/at91_twi.c ============================================================================== --- head/sys/arm/at91/at91_twi.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/at91_twi.c Fri Sep 30 04:55:23 2011 (r225882) @@ -139,7 +139,7 @@ at91_twi_attach(device_t dev) device_printf(dev, "could not allocate iicbus instance\n"); /* probe and attach the iicbus */ bus_generic_attach(dev); -out:; +out: if (err) at91_twi_deactivate(dev); return (err); @@ -365,7 +365,7 @@ at91_twi_transfer(device_t dev, struct i if ((err = at91_twi_wait(sc, TWI_SR_TXCOMP))) break; } -out:; +out: if (err) { WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); Modified: head/sys/arm/at91/uart_dev_at91usart.c ============================================================================== --- head/sys/arm/at91/uart_dev_at91usart.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/at91/uart_dev_at91usart.c Fri Sep 30 04:55:23 2011 (r225882) @@ -406,7 +406,7 @@ at91_usart_bus_attach(struct uart_softc WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); -errout:; +errout: // XXX bad return (err); } Modified: head/sys/arm/econa/if_ece.c ============================================================================== --- head/sys/arm/econa/if_ece.c Thu Sep 29 18:42:44 2011 (r225881) +++ head/sys/arm/econa/if_ece.c Fri Sep 30 04:55:23 2011 (r225882) @@ -441,7 +441,7 @@ ece_attach(device_t dev) taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->dev)); -out:; +out: if (err) ece_deactivate(dev); if (err && ifp)