summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorkevlo <kevlo@FreeBSD.org>2011-09-30 04:55:23 +0000
committerkevlo <kevlo@FreeBSD.org>2011-09-30 04:55:23 +0000
commita99e6ac189fdfb617cc492cd61628ff44ca6d946 (patch)
treea661550a0f3a6c2797c3ef4bdcbfe380a9ed6fc5 /sys/arm
parente28d9921b6f0b7d72390281b0472303c97342fd9 (diff)
downloadFreeBSD-src-a99e6ac189fdfb617cc492cd61628ff44ca6d946.zip
FreeBSD-src-a99e6ac189fdfb617cc492cd61628ff44ca6d946.tar.gz
Remove pointless semicolons after label
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/at91/at91_mci.c2
-rw-r--r--sys/arm/at91/at91_pio.c2
-rw-r--r--sys/arm/at91/at91_rtc.c2
-rw-r--r--sys/arm/at91/at91_spi.c4
-rw-r--r--sys/arm/at91/at91_ssc.c2
-rw-r--r--sys/arm/at91/at91_twi.c4
-rw-r--r--sys/arm/at91/uart_dev_at91usart.c2
-rw-r--r--sys/arm/econa/if_ece.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/sys/arm/at91/at91_mci.c b/sys/arm/at91/at91_mci.c
index 17cf9c2..4f88d7e 100644
--- a/sys/arm/at91/at91_mci.c
+++ b/sys/arm/at91/at91_mci.c
@@ -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);
diff --git a/sys/arm/at91/at91_pio.c b/sys/arm/at91/at91_pio.c
index 853e588..53dfddb 100644
--- a/sys/arm/at91/at91_pio.c
+++ b/sys/arm/at91/at91_pio.c
@@ -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);
diff --git a/sys/arm/at91/at91_rtc.c b/sys/arm/at91/at91_rtc.c
index e1a8f25..934fd22 100644
--- a/sys/arm/at91/at91_rtc.c
+++ b/sys/arm/at91/at91_rtc.c
@@ -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);
diff --git a/sys/arm/at91/at91_spi.c b/sys/arm/at91/at91_spi.c
index 2252f00..e5bf52f 100644
--- a/sys/arm/at91/at91_spi.c
+++ b/sys/arm/at91/at91_spi.c
@@ -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 child, struct spi_command *cmd)
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);
diff --git a/sys/arm/at91/at91_ssc.c b/sys/arm/at91/at91_ssc.c
index e6b1c7f..12ae90a 100644
--- a/sys/arm/at91/at91_ssc.c
+++ b/sys/arm/at91/at91_ssc.c
@@ -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);
diff --git a/sys/arm/at91/at91_twi.c b/sys/arm/at91/at91_twi.c
index fdd377a..a70fed0 100644
--- a/sys/arm/at91/at91_twi.c
+++ b/sys/arm/at91/at91_twi.c
@@ -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 iic_msg *msgs, uint32_t nmsgs)
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);
diff --git a/sys/arm/at91/uart_dev_at91usart.c b/sys/arm/at91/uart_dev_at91usart.c
index f3d21aa..d1a52ba 100644
--- a/sys/arm/at91/uart_dev_at91usart.c
+++ b/sys/arm/at91/uart_dev_at91usart.c
@@ -406,7 +406,7 @@ at91_usart_bus_attach(struct uart_softc *sc)
WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY);
}
WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK);
-errout:;
+errout:
// XXX bad
return (err);
}
diff --git a/sys/arm/econa/if_ece.c b/sys/arm/econa/if_ece.c
index a7433f2..5169101 100644
--- a/sys/arm/econa/if_ece.c
+++ b/sys/arm/econa/if_ece.c
@@ -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)
OpenPOWER on IntegriCloud