summaryrefslogtreecommitdiff
path: root/sys/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/altera/socfpga/socfpga_rstmgr.c2
-rw-r--r--sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c2
-rw-r--r--sys/arm/arm/disassem.c2
-rw-r--r--sys/arm/arm/vm_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx6_sdma.c2
-rw-r--r--sys/arm/freescale/imx/imx6_ssi.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_ccm.c10
-rw-r--r--sys/arm/freescale/vybrid/vf_edma.c6
-rw-r--r--sys/arm/freescale/vybrid/vf_port.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_sai.c12
-rw-r--r--sys/arm/mv/mv_pci.c2
-rw-r--r--sys/arm/samsung/exynos/chrome_ec.c4
-rw-r--r--sys/arm/samsung/exynos/chrome_ec_spi.c4
-rw-r--r--sys/arm/samsung/exynos/chrome_kb.c14
-rw-r--r--sys/arm/samsung/exynos/exynos5_i2c.c6
-rw-r--r--sys/arm/samsung/exynos/exynos5_pad.c8
16 files changed, 40 insertions, 40 deletions
diff --git a/sys/arm/altera/socfpga/socfpga_rstmgr.c b/sys/arm/altera/socfpga/socfpga_rstmgr.c
index 36a1d75582101..49db05ef4a1ec 100644
--- a/sys/arm/altera/socfpga/socfpga_rstmgr.c
+++ b/sys/arm/altera/socfpga/socfpga_rstmgr.c
@@ -145,7 +145,7 @@ rstmgr_sysctl(SYSCTL_HANDLER_ARGS)
break;
default:
return (1);
- };
+ }
reg = READ4(sc, RSTMGR_BRGMODRST);
enable = reg & bit ? 0 : 1;
diff --git a/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c b/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
index 3daa99fd8a415..75825fb93533b 100644
--- a/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
+++ b/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
@@ -621,7 +621,7 @@ spurious:
stop = 1;
if ((sndr & AML_SDXC_SEND_RESP_136) != 0) {
start = 1;
- stop = start + 4;;
+ stop = start + 4;
}
for (i = start; i < stop; i++) {
pdmar = CSR_READ_4(sc, AML_SDXC_PDMA_REG);
diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c
index dbe533a4ab065..b7aa099c83354 100644
--- a/sys/arm/arm/disassem.c
+++ b/sys/arm/arm/disassem.c
@@ -523,7 +523,7 @@ disasm(const disasm_interface_t *di, vm_offset_t loc, int altfmt)
else
di->di_printf(", ");
}
- };
+ }
di->di_printf("\n");
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index fdab1c685b542..fec2ca034fdf9 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -148,7 +148,7 @@ cpu_fork(register struct thread *td1, register struct proc *p2,
/* Setup to release spin count in fork_exit(). */
td2->td_md.md_spinlock_count = 1;
- td2->td_md.md_saved_cspr = PSR_SVC32_MODE;;
+ td2->td_md.md_saved_cspr = PSR_SVC32_MODE;
#if __ARM_ARCH >= 6
td2->td_md.md_tp = td1->td_md.md_tp;
#else
diff --git a/sys/arm/freescale/imx/imx6_sdma.c b/sys/arm/freescale/imx/imx6_sdma.c
index ae9a3390cc50f..4839270e7cc8e 100644
--- a/sys/arm/freescale/imx/imx6_sdma.c
+++ b/sys/arm/freescale/imx/imx6_sdma.c
@@ -444,7 +444,7 @@ boot_firmware(struct sdma_softc *sc)
if (timeout-- <= 0)
break;
DELAY(10);
- };
+ }
if (ret == 0) {
device_printf(sc->dev, "SDMA failed to boot\n");
diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c
index 184de2a40f0cd..9387aa371ffb7 100644
--- a/sys/arm/freescale/imx/imx6_ssi.c
+++ b/sys/arm/freescale/imx/imx6_ssi.c
@@ -463,7 +463,7 @@ find_sdma_controller(struct sc_info *sc)
if (sdma_sc == NULL) {
device_printf(sc->dev, "No sDMA found. Can't operate\n");
return (ENXIO);
- };
+ }
sc->sdma_sc = sdma_sc;
diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
index 8f8a3f03de841..82284d5889848 100644
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -379,15 +379,15 @@ set_clock(struct ccm_softc *sc, char *name)
reg &= ~(clk->sel_mask << clk->sel_shift);
reg |= (clk->sel_val << clk->sel_shift);
WRITE4(sc, clk->sel_reg, reg);
- };
+ }
reg = READ4(sc, clk->reg);
reg |= clk->enable_reg;
reg &= ~(clk->div_mask << clk->div_shift);
reg |= (clk->div_val << clk->div_shift);
WRITE4(sc, clk->reg, reg);
- };
- };
+ }
+ }
return (0);
}
@@ -425,8 +425,8 @@ ccm_fdt_set(struct ccm_softc *sc)
fdt_config += strlen(name) + 1;
len -= strlen(name) + 1;
set_clock(sc, name);
- };
- };
+ }
+ }
if (OF_peer(child) == 0) {
/* No more siblings. */
diff --git a/sys/arm/freescale/vybrid/vf_edma.c b/sys/arm/freescale/vybrid/vf_edma.c
index ed12072fa6cbc..93179216a5b29 100644
--- a/sys/arm/freescale/vybrid/vf_edma.c
+++ b/sys/arm/freescale/vybrid/vf_edma.c
@@ -161,7 +161,7 @@ channel_configure(struct edma_softc *sc, int mux_grp, int mux_src)
} else {
channel_first = 0;
mux_num = sc->device_id * 2;
- };
+ }
/* Take first unused eDMA channel */
ch = NULL;
@@ -171,12 +171,12 @@ channel_configure(struct edma_softc *sc, int mux_grp, int mux_src)
break;
}
ch = NULL;
- };
+ }
if (ch == NULL) {
/* Can't find free channel */
return (-1);
- };
+ }
chnum = i;
diff --git a/sys/arm/freescale/vybrid/vf_port.c b/sys/arm/freescale/vybrid/vf_port.c
index 943ca8861370d..6ff8bfcccb10b 100644
--- a/sys/arm/freescale/vybrid/vf_port.c
+++ b/sys/arm/freescale/vybrid/vf_port.c
@@ -171,7 +171,7 @@ port_setup(int pnum, enum ev_type pevt, void (*ih)(void *), void *ih_user)
break;
default:
return (-1);
- };
+ }
reg = READ4(sc, PORT_PCR(pnum));
reg &= ~(PCR_IRQC_M << PCR_IRQC_S);
diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c
index 309d95e5dcb85..83f689f87d243 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -433,7 +433,7 @@ find_edma_controller(struct sc_info *sc)
if ((len = OF_getproplen(edma_node, "device-id")) <= 0) {
return (ENXIO);
- };
+ }
OF_getprop(edma_node, "device-id", &dts_value, len);
edma_device_id = fdt32_to_cpu(dts_value);
@@ -447,16 +447,16 @@ find_edma_controller(struct sc_info *sc)
if (edma_sc->device_id == edma_device_id) {
/* found */
break;
- };
+ }
edma_sc = NULL;
- };
- };
+ }
+ }
if (edma_sc == NULL) {
device_printf(sc->dev, "no eDMA. can't operate\n");
return (ENXIO);
- };
+ }
sc->edma_sc = edma_sc;
@@ -465,7 +465,7 @@ find_edma_controller(struct sc_info *sc)
if (sc->edma_chnum < 0) {
/* cant setup eDMA */
return (ENXIO);
- };
+ }
return (0);
};
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index dc8b890e305d4..2ef6604a89dc1 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -842,7 +842,7 @@ mv_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
default:
return (BUS_ALLOC_RESOURCE(device_get_parent(dev), dev,
type, rid, start, end, count, flags));
- };
+ }
if (RMAN_IS_DEFAULT_RANGE(start, end)) {
start = sc->sc_mem_base;
diff --git a/sys/arm/samsung/exynos/chrome_ec.c b/sys/arm/samsung/exynos/chrome_ec.c
index 2c88414d2d358..8f794b79c7ee2 100644
--- a/sys/arm/samsung/exynos/chrome_ec.c
+++ b/sys/arm/samsung/exynos/chrome_ec.c
@@ -176,7 +176,7 @@ ec_command(uint8_t cmd, uint8_t *dout, uint8_t dout_len,
for (i = 0; i < dout_len; i++) {
msg_dout[i + 3] = dout[i];
- };
+ }
fill_checksum(msg_dout, dout_len + 3);
@@ -195,7 +195,7 @@ ec_command(uint8_t cmd, uint8_t *dout, uint8_t dout_len,
for (i = 0; i < dinp_len; i++) {
dinp[i] = msg_dinp[i + 2];
- };
+ }
free(msg_dout, M_DEVBUF);
free(msg_dinp, M_DEVBUF);
diff --git a/sys/arm/samsung/exynos/chrome_ec_spi.c b/sys/arm/samsung/exynos/chrome_ec_spi.c
index a018afae9d244..9e54969d02e91 100644
--- a/sys/arm/samsung/exynos/chrome_ec_spi.c
+++ b/sys/arm/samsung/exynos/chrome_ec_spi.c
@@ -143,7 +143,7 @@ ec_command(uint8_t cmd, uint8_t *dout, uint8_t dout_len,
for (i = 0; i < dout_len; i++) {
msg_dout[i + 3] = dout[i];
- };
+ }
fill_checksum(msg_dout, dout_len + 3);
@@ -177,7 +177,7 @@ ec_command(uint8_t cmd, uint8_t *dout, uint8_t dout_len,
for (i = 0; i < dinp_len; i++) {
dinp[i] = msg_dinp[i + 2];
- };
+ }
free(msg_dout, M_DEVBUF);
free(msg_dinp, M_DEVBUF);
diff --git a/sys/arm/samsung/exynos/chrome_kb.c b/sys/arm/samsung/exynos/chrome_kb.c
index b10a5ac8b1870..6965d3c86ed0b 100644
--- a/sys/arm/samsung/exynos/chrome_kb.c
+++ b/sys/arm/samsung/exynos/chrome_kb.c
@@ -255,12 +255,12 @@ ckb_check(keyboard_t *kbd)
if (sc->sc_flags & CKB_FLAG_POLLING) {
return (1);
- };
+ }
for (i = 0; i < sc->cols; i++)
if (sc->scan_local[i] != sc->scan[i]) {
return (1);
- };
+ }
if (sc->sc_repeating)
return (1);
@@ -356,7 +356,7 @@ ckb_read_char_locked(keyboard_t *kbd, int wait)
callout_reset(&sc->sc_repeat_callout, hz / 10,
ckb_repeat, sc);
return (sc->sc_repeat_key);
- };
+ }
if (sc->sc_flags & CKB_FLAG_POLLING) {
for (;;) {
@@ -374,7 +374,7 @@ ckb_read_char_locked(keyboard_t *kbd, int wait)
}
DELAY(1000);
}
- };
+ }
for (i = 0; i < sc->cols; i++) {
for (j = 0; j < sc->rows; j++) {
@@ -387,7 +387,7 @@ ckb_read_char_locked(keyboard_t *kbd, int wait)
key = keymap_read(sc, i, j);
if (key == 0) {
continue;
- };
+ }
if (newbit > 0) {
/* key pressed */
@@ -841,7 +841,7 @@ chrome_kb_attach(device_t dev)
for (i = 0; i < sc->cols; i++) {
sc->scan_local[i] = 0;
sc->scan[i] = 0;
- };
+ }
kbd_init_struct(kbd, KBD_DRIVER_NAME, KB_OTHER,
device_get_unit(dev), 0, 0, 0);
@@ -866,7 +866,7 @@ chrome_kb_attach(device_t dev)
if (kbd_register(kbd) < 0) {
return (ENXIO);
- };
+ }
KBD_CONFIG_DONE(kbd);
return (0);
diff --git a/sys/arm/samsung/exynos/exynos5_i2c.c b/sys/arm/samsung/exynos/exynos5_i2c.c
index d8791386bcbbf..756a27d448d9d 100644
--- a/sys/arm/samsung/exynos/exynos5_i2c.c
+++ b/sys/arm/samsung/exynos/exynos5_i2c.c
@@ -292,7 +292,7 @@ i2c_start(device_t dev, u_char slave, int timeout)
mtx_unlock(&sc->mutex);
return (IIC_ENOACK);
- };
+ }
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -387,7 +387,7 @@ i2c_read(device_t dev, char *buf, int len,
reg = READ1(sc, I2CCON);
reg &= ~(ACKGEN);
WRITE1(sc, I2CCON, reg);
- };
+ }
clear_ipend(sc);
@@ -444,7 +444,7 @@ i2c_write(device_t dev, const char *buf, int len, int *sent, int timeout)
DPRINTF("cant i2c write: no ack\n");
mtx_unlock(&sc->mutex);
return (IIC_ENOACK);
- };
+ }
(*sent)++;
}
diff --git a/sys/arm/samsung/exynos/exynos5_pad.c b/sys/arm/samsung/exynos/exynos5_pad.c
index ea07f5d010e0e..27d0d53f8bbe2 100644
--- a/sys/arm/samsung/exynos/exynos5_pad.c
+++ b/sys/arm/samsung/exynos/exynos5_pad.c
@@ -330,10 +330,10 @@ get_bank(struct pad_softc *sc, int gpio_number,
*bank = sc->gpio_map[i];
*pin_shift = (gpio_number - n);
return (0);
- };
+ }
n += ngpio;
- };
+ }
return (-1);
}
@@ -516,7 +516,7 @@ pad_attach(device_t dev)
break;
default:
goto fail;
- };
+ }
if (bus_alloc_resources(dev, sc->pad_spec, sc->res)) {
device_printf(dev, "could not allocate resources\n");
@@ -528,7 +528,7 @@ pad_attach(device_t dev)
for (i = 0; i < sc->nports; i++) {
sc->bst[i] = rman_get_bustag(sc->res[i]);
sc->bsh[i] = rman_get_bushandle(sc->res[i]);
- };
+ }
sc->dev = dev;