svn commit: r237094 - stable/8/sys/arm/at91

[Marius Strobl]

Author: marius
Date: Thu Jun 14 20:02:54 2012
New Revision: 237094
URL: http://svn.freebsd.org/changeset/base/237094

Log:
  MFC: r225882
  
  Remove pointless semicolons after label

Modified:
  stable/8/sys/arm/at91/at91_mci.c
  stable/8/sys/arm/at91/at91_pio.c
  stable/8/sys/arm/at91/at91_rtc.c
  stable/8/sys/arm/at91/at91_spi.c
  stable/8/sys/arm/at91/at91_ssc.c
  stable/8/sys/arm/at91/at91_twi.c
  stable/8/sys/arm/at91/uart_dev_at91usart.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/arm/at91/at91_mci.c
==============================================================================
--- stable/8/sys/arm/at91/at91_mci.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/at91_mci.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -211,7 +211,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/8/sys/arm/at91/at91_pio.c
==============================================================================
--- stable/8/sys/arm/at91/at91_pio.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/at91_pio.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -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: stable/8/sys/arm/at91/at91_rtc.c
==============================================================================
--- stable/8/sys/arm/at91/at91_rtc.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/at91_rtc.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -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/8/sys/arm/at91/at91_spi.c
==============================================================================
--- stable/8/sys/arm/at91/at91_spi.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/at91_spi.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -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/8/sys/arm/at91/at91_ssc.c
==============================================================================
--- stable/8/sys/arm/at91/at91_ssc.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/at91_ssc.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -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/8/sys/arm/at91/at91_twi.c
==============================================================================
--- stable/8/sys/arm/at91/at91_twi.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/at91_twi.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -140,7 +140,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/8/sys/arm/at91/uart_dev_at91usart.c
==============================================================================
--- stable/8/sys/arm/at91/uart_dev_at91usart.c	Thu Jun 14 20:02:53 2012	(r237093)
+++ stable/8/sys/arm/at91/uart_dev_at91usart.c	Thu Jun 14 20:02:54 2012	(r237094)
@@ -412,7 +412,7 @@ at91_usart_bus_attach(struct uart_softc 
 	}
 	WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK);
 #ifndef SKYEYE_WORKAROUNDS
-errout:;
+errout:
 	// XXX bad
 	return (err);
 #else