summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2005-11-19 01:59:38 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2005-11-19 01:59:38 +0000
commit16017b33d1fad6b6fd295f39b365b33719b42ae9 (patch)
treedd744503f5f61982f700de633cd3e581ecf4fc23 /sys/arch
parent2ce5c95d13b01831f3ec854499928fd2b1b80943 (diff)
Remove superfluous statement-ending semi-colons. i.e., "return foo;;" should
just be "return foo;". Cleaning out some M's in my tree.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm/arm/ast.c4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_apm.c4
-rw-r--r--sys/arch/hp300/dev/hyper.c4
-rw-r--r--sys/arch/i386/pci/geodesc.c4
4 files changed, 8 insertions, 8 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);