Module Name: src
Committed By: mbalmer
Date: Tue Jan 5 13:14:56 UTC 2010
Modified Files:
src/sys/arch/arm/arm32: fault.c
src/sys/arch/arm/ep93xx: eprtc.c
src/sys/arch/arm/gemini: gemini_obio.c gemini_pci.c gemini_timer.c
src/sys/arch/arm/s3c2xx0: s3c2410_extint.c
Log Message:
One semicolon is enough.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/eprtc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/gemini/gemini_obio.c \
src/sys/arch/arm/gemini/gemini_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_timer.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.73 src/sys/arch/arm/arm32/fault.c:1.74
--- src/sys/arch/arm/arm32/fault.c:1.73 Sat Nov 21 20:32:18 2009
+++ src/sys/arch/arm/arm32/fault.c Tue Jan 5 13:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.73 2009/11/21 20:32:18 rmind Exp $ */
+/* $NetBSD: fault.c,v 1.74 2010/01/05 13:14:55 mbalmer Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
#include "opt_sa.h"
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.73 2009/11/21 20:32:18 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.74 2010/01/05 13:14:55 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -259,7 +259,7 @@
LWP_CACHE_CREDS(l, l->l_proc);
/* Grab the current pcb */
- pcb = lwp_getpcb(l);;
+ pcb = lwp_getpcb(l);
/* Invoke the appropriate handler, if necessary */
if (__predict_false(data_aborts[fsr & FAULT_TYPE_MASK].func != NULL)) {
Index: src/sys/arch/arm/ep93xx/eprtc.c
diff -u src/sys/arch/arm/ep93xx/eprtc.c:1.3 src/sys/arch/arm/ep93xx/eprtc.c:1.4
--- src/sys/arch/arm/ep93xx/eprtc.c:1.3 Sat Dec 12 14:44:08 2009
+++ src/sys/arch/arm/ep93xx/eprtc.c Tue Jan 5 13:14:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: eprtc.c,v 1.3 2009/12/12 14:44:08 tsutsui Exp $ */
+/* $NetBSD: eprtc.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.3 2009/12/12 14:44:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@
static int
eprtc_gettime(struct todr_chip_handle *ch, struct timeval *tv)
{
- struct eprtc_softc *sc = ch->cookie;;
+ struct eprtc_softc *sc = ch->cookie;
tv->tv_sec = bus_space_read_4(sc->sc_iot, sc->sc_ioh, EP93XX_RTC_Data);
tv->tv_usec = 0;
@@ -95,7 +95,7 @@
static int
eprtc_settime(struct todr_chip_handle *ch, struct timeval *tv)
{
- struct eprtc_softc *sc = ch->cookie;;
+ struct eprtc_softc *sc = ch->cookie;
bus_space_write_4(sc->sc_iot, sc->sc_ioh, EP93XX_RTC_Load, tv->tv_sec);
return 0;
Index: src/sys/arch/arm/gemini/gemini_obio.c
diff -u src/sys/arch/arm/gemini/gemini_obio.c:1.7 src/sys/arch/arm/gemini/gemini_obio.c:1.8
--- src/sys/arch/arm/gemini/gemini_obio.c:1.7 Thu Nov 20 20:23:05 2008
+++ src/sys/arch/arm/gemini/gemini_obio.c Tue Jan 5 13:14:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_obio.c,v 1.7 2008/11/20 20:23:05 cliff Exp $ */
+/* $NetBSD: gemini_obio.c,v 1.8 2010/01/05 13:14:56 mbalmer Exp $ */
/* adapted from:
* NetBSD: omap2_obio.c,v 1.5 2008/10/21 18:50:25 matt Exp
@@ -104,7 +104,7 @@
#include "opt_gemini.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.7 2008/11/20 20:23:05 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.8 2010/01/05 13:14:56 mbalmer Exp $");
#include "locators.h"
#include "obio.h"
@@ -211,7 +211,7 @@
* attach the PCI bus
*/
pba.pba_memt = sc->sc_iot;
- pba.pba_iot = sc->sc_iot;;
+ pba.pba_iot = sc->sc_iot;
pba.pba_dmat = sc->sc_dmat;
pba.pba_dmat64 = NULL;
pba.pba_pc = &sc->sc_pci_chipset;
Index: src/sys/arch/arm/gemini/gemini_pci.c
diff -u src/sys/arch/arm/gemini/gemini_pci.c:1.7 src/sys/arch/arm/gemini/gemini_pci.c:1.8
--- src/sys/arch/arm/gemini/gemini_pci.c:1.7 Thu Dec 4 00:36:33 2008
+++ src/sys/arch/arm/gemini/gemini_pci.c Tue Jan 5 13:14:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_pci.c,v 1.7 2008/12/04 00:36:33 cliff Exp $ */
+/* $NetBSD: gemini_pci.c,v 1.8 2010/01/05 13:14:56 mbalmer Exp $ */
/* adapted from:
* NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.7 2008/12/04 00:36:33 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.8 2010/01/05 13:14:56 mbalmer Exp $");
#include <sys/cdefs.h>
@@ -416,7 +416,7 @@
gemini_pci_intr_disestablish(void *v, void *cookie)
{
pcireg_t r;
- struct gemini_pci_intrq *iqp = (struct gemini_pci_intrq *)cookie;;
+ struct gemini_pci_intrq *iqp = (struct gemini_pci_intrq *)cookie;
void *ih = iqp->iq_ih;
gemini_pci_intrq_remove(cookie);
Index: src/sys/arch/arm/gemini/gemini_timer.c
diff -u src/sys/arch/arm/gemini/gemini_timer.c:1.3 src/sys/arch/arm/gemini/gemini_timer.c:1.4
--- src/sys/arch/arm/gemini/gemini_timer.c:1.3 Wed Mar 18 10:22:24 2009
+++ src/sys/arch/arm/gemini/gemini_timer.c Tue Jan 5 13:14:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_timer.c,v 1.3 2009/03/18 10:22:24 cegger Exp $ */
+/* $NetBSD: gemini_timer.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $ */
/* adapted from:
* NetBSD: omap2_geminitmr.c,v 1.1 2008/08/27 11:03:10 matt Exp
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.3 2009/03/18 10:22:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.4 2010/01/05 13:14:56 mbalmer Exp $");
#include "opt_gemini.h"
#include "opt_cpuoptions.h"
@@ -233,7 +233,7 @@
int
clockintr(void *frame)
{
- struct geminitmr_softc *sc = clock_sc;;
+ struct geminitmr_softc *sc = clock_sc;
_timer_intr_clr(sc);
_timer_reload(sc, sc->sc_tf.tf_counter);
@@ -246,7 +246,7 @@
int
statintr(void *frame)
{
- struct geminitmr_softc *sc = stat_sc;;
+ struct geminitmr_softc *sc = stat_sc;
_timer_intr_clr(sc);
_timer_reload(sc, sc->sc_tf.tf_counter);
Index: src/sys/arch/arm/s3c2xx0/s3c2410_extint.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.9 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.10
--- src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.9 Sun Jan 6 01:37:55 2008
+++ src/sys/arch/arm/s3c2xx0/s3c2410_extint.c Tue Jan 5 13:14:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_extint.c,v 1.9 2008/01/06 01:37:55 matt Exp $ */
+/* $NetBSD: s3c2410_extint.c,v 1.10 2010/01/05 13:14:56 mbalmer Exp $ */
/*
* Copyright (c) 2003 Genetec corporation. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.9 2008/01/06 01:37:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.10 2010/01/05 13:14:56 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -257,7 +257,7 @@
}
- save = disable_interrupts(I32_bit);;
+ save = disable_interrupts(I32_bit);
pending = pending_mask & bus_space_read_4(iot, ioh, GPIO_EINTPEND);
pending &= ~ssextio_softc->sc_mask;
ssextio_softc->sc_pending |= pending;
