Remove superfluous statement-ending semi-colons. i.e., "return foo;;" should

just be "return foo;".  Cleaning out some M's in my tree.

6 files changed, 12 insertions, 12 deletions

diff --git a/sys/arch/arm/arm/ast.c b/sys/arch/arm/arm/ast.c
index fde656bb5af..3e2ca77e181 100644
--- a/sys/arch/arm/arm/ast.c
+++ b/sys/arch/arm/arm/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.4 2005/03/04 00:56:42 martin Exp $	*/
+/*	$OpenBSD: ast.c,v 1.5 2005/11/19 01:59:36 aaron Exp $	*/
 /*	$NetBSD: ast.c,v 1.6 2003/10/31 16:44:34 cl Exp $	*/
 
 /*
@@ -113,7 +113,7 @@ userret(struct proc *p, u_int32_t pc, quad_t oticks)
 void
 ast(struct trapframe *tf)
 {
-	struct proc *p = curproc;;
+	struct proc *p = curproc;
 
 #ifdef acorn26
 	/* Enable interrupts if they were enabled before the trap. */
diff --git a/sys/arch/arm/xscale/pxa2x0_apm.c b/sys/arch/arm/xscale/pxa2x0_apm.c
index d43bf0c381a..e12f87506c2 100644
--- a/sys/arch/arm/xscale/pxa2x0_apm.c
+++ b/sys/arch/arm/xscale/pxa2x0_apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_apm.c,v 1.17 2005/10/31 05:23:32 deraadt Exp $	*/
+/*	$OpenBSD: pxa2x0_apm.c,v 1.18 2005/11/19 01:59:36 aaron Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -296,7 +296,7 @@ apm_power_info(struct pxa2x0_apm_softc *sc,
 {
 
 	power->ac_state = APM_AC_UNKNOWN;
-	power->battery_state = APM_BATT_UNKNOWN;;
+	power->battery_state = APM_BATT_UNKNOWN;
 	power->battery_life = 0 /* APM_BATT_LIFE_UNKNOWN */;
 	power->minutes_left = 0;
 
diff --git a/sys/arch/hp300/dev/hyper.c b/sys/arch/hp300/dev/hyper.c
index 4a8cab5cbc3..7e414fc9fb1 100644
--- a/sys/arch/hp300/dev/hyper.c
+++ b/sys/arch/hp300/dev/hyper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hyper.c,v 1.9 2005/01/24 21:36:39 miod Exp $	*/
+/*	$OpenBSD: hyper.c,v 1.10 2005/11/19 01:59:36 aaron Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat.
@@ -159,7 +159,7 @@ hyper_attach(struct device *parent, struct device *self, void *aux)
 	scode = da->da_scode;
 	if (scode == conscode) {
 		fbr = (struct diofbreg *)conaddr;	/* already mapped */
-		sc->sc_fb = &diofb_cn;;
+		sc->sc_fb = &diofb_cn;
 	} else {
 		sc->sc_fb = &sc->sc_fb_store;
 		fbr = (struct diofbreg *)
diff --git a/sys/arch/i386/pci/geodesc.c b/sys/arch/i386/pci/geodesc.c
index f722d1ba7c5..a017c56e73a 100644
--- a/sys/arch/i386/pci/geodesc.c
+++ b/sys/arch/i386/pci/geodesc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: geodesc.c,v 1.3 2003/11/26 02:21:53 kevlo Exp $	*/
+/*	$OpenBSD: geodesc.c,v 1.4 2005/11/19 01:59:36 aaron Exp $	*/
 
 /*
  * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
@@ -97,7 +97,7 @@ geodesc_attach(struct device *parent, struct device *self, void *aux)
 	bus_space_write_2(sc->sc_iot, sc->sc_ioh, GCB_WDTO, 0);
 	sts |= WDOVF_CLEAR;
 	bus_space_write_1(sc->sc_iot, sc->sc_ioh, GCB_WDSTS, sts);
-	cnfg &= ~WDCNFG_MASK;;
+	cnfg &= ~WDCNFG_MASK;
 	cnfg |= WDTYPE1_RESET|WDPRES_DIV_512;
 	bus_space_write_2(sc->sc_iot, sc->sc_ioh, GCB_WDCNFG, cnfg);
 
diff --git a/sys/dev/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c
index 60473af0b07..02eadfc0dd8 100644
--- a/sys/dev/ic/mtd8xx.c
+++ b/sys/dev/ic/mtd8xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xx.c,v 1.10 2005/11/07 03:20:00 brad Exp $	*/
+/*	$OpenBSD: mtd8xx.c,v 1.11 2005/11/19 01:59:37 aaron Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -295,7 +295,7 @@ mtd_miibus_writereg(struct device *self, int phy, int reg, int val)
 		for (mask = 0x8000; mask; mask >>= 1) {
 			miir &= ~(MIIMGT_MDC | MIIMGT_MDO);
 			if (mask & (u_int32_t)val)
-				miir |= MIIMGT_MDO;;
+				miir |= MIIMGT_MDO;
 			CSR_WRITE_4(MTD_MIIMGT, miir);
 			miir |= MIIMGT_MDC;
 			CSR_WRITE_4(MTD_MIIMGT, miir);
diff --git a/sys/gnu/arch/i386/fpemul/fpu_trig.c b/sys/gnu/arch/i386/fpemul/fpu_trig.c
index 78460707693..bbb72a06c7f 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/arch/i386/fpemul/fpu_trig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_trig.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
+/*	$OpenBSD: fpu_trig.c,v 1.3 2005/11/19 01:59:37 aaron Exp $	*/
 /*
  *  fpu_trig.c
  *
@@ -103,7 +103,7 @@ trig_arg(FPU_REG * X)
 	rv = q & 7;
 
 	control_word = old_cw;
-	return rv;;
+	return rv;
 }