Date: Thu, 14 Jun 2012 20:02:53 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r237093 - in stable/9/sys/arm: at91 econa Message-ID: <201206142002.q5EK2rSU015963@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Thu Jun 14 20:02:53 2012 New Revision: 237093 URL: http://svn.freebsd.org/changeset/base/237093 Log: MFC: r225882 Remove pointless semicolons after label Modified: stable/9/sys/arm/at91/at91_mci.c stable/9/sys/arm/at91/at91_pio.c stable/9/sys/arm/at91/at91_rtc.c stable/9/sys/arm/at91/at91_spi.c stable/9/sys/arm/at91/at91_ssc.c stable/9/sys/arm/at91/at91_twi.c stable/9/sys/arm/at91/uart_dev_at91usart.c stable/9/sys/arm/econa/if_ece.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/arm/at91/at91_mci.c ============================================================================== --- stable/9/sys/arm/at91/at91_mci.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/at91_mci.c Thu Jun 14 20:02:53 2012 (r237093) @@ -249,7 +249,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: stable/9/sys/arm/at91/at91_pio.c ============================================================================== --- stable/9/sys/arm/at91/at91_pio.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/at91_pio.c Thu Jun 14 20:02:53 2012 (r237093) @@ -165,7 +165,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: stable/9/sys/arm/at91/at91_rtc.c ============================================================================== --- stable/9/sys/arm/at91/at91_rtc.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/at91_rtc.c Thu Jun 14 20:02:53 2012 (r237093) @@ -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: stable/9/sys/arm/at91/at91_spi.c ============================================================================== --- stable/9/sys/arm/at91/at91_spi.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/at91_spi.c Thu Jun 14 20:02:53 2012 (r237093) @@ -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: stable/9/sys/arm/at91/at91_ssc.c ============================================================================== --- stable/9/sys/arm/at91/at91_ssc.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/at91_ssc.c Thu Jun 14 20:02:53 2012 (r237093) @@ -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: stable/9/sys/arm/at91/at91_twi.c ============================================================================== --- stable/9/sys/arm/at91/at91_twi.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/at91_twi.c Thu Jun 14 20:02:53 2012 (r237093) @@ -142,7 +142,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); @@ -369,7 +369,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: stable/9/sys/arm/at91/uart_dev_at91usart.c ============================================================================== --- stable/9/sys/arm/at91/uart_dev_at91usart.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/at91/uart_dev_at91usart.c Thu Jun 14 20:02:53 2012 (r237093) @@ -428,7 +428,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: return (err); } Modified: stable/9/sys/arm/econa/if_ece.c ============================================================================== --- stable/9/sys/arm/econa/if_ece.c Thu Jun 14 19:55:22 2012 (r237092) +++ stable/9/sys/arm/econa/if_ece.c Thu Jun 14 20:02:53 2012 (r237093) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206142002.q5EK2rSU015963>