Module Name: src
Committed By: maya
Date: Wed Jun 6 01:49:09 UTC 2018
Modified Files:
src/sys/arch/arm/imx: imx51_esdhc.c
src/sys/arch/cobalt/cobalt: interrupt.c
src/sys/arch/evbmips/rmixl: machdep.c
src/sys/arch/luna68k/dev: omrasops.c
src/sys/arch/mips/mips: pmap_machdep.c
src/sys/arch/sparc64/sparc64: cpu.c
src/sys/arch/usermode/target/i386: cpu_i386.c
src/sys/arch/usermode/target/x86_64: cpu_x86_64.c
src/sys/arch/vax/vsa: lcg.c
src/sys/dev/acpi/wmi: wmi_hp.c
src/sys/dev/filemon: filemon.c
src/sys/dev/i2c: ibmhawk.c
src/sys/dev/pci: coram.c cy82c693.c if_iwm.c radeonfb.c
src/sys/dev/usb: ehci.c ohci.c
src/sys/fs/udf: udf_subr.c
src/sys/net: if_strip.c
src/sys/opencrypto: crypto.c
src/sys/rump/dev/lib/libpci: pci_at_mainbus.c
src/sys/ufs/lfs: lfs_segment.c
Log Message:
Remove duplicate ;
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_esdhc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cobalt/cobalt/interrupt.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbmips/rmixl/machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/luna68k/dev/omrasops.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/mips/pmap_machdep.c
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/target/i386/cpu_i386.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/target/x86_64/cpu_x86_64.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vsa/lcg.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/wmi/wmi_hp.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/ibmhawk.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/coram.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/cy82c693.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.258 -r1.259 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.280 -r1.281 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.140 -r1.141 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.109 -r1.110 src/sys/net/if_strip.c
cvs rdiff -u -r1.105 -r1.106 src/sys/opencrypto/crypto.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.275 -r1.276 src/sys/ufs/lfs/lfs_segment.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/imx/imx51_esdhc.c
diff -u src/sys/arch/arm/imx/imx51_esdhc.c:1.3 src/sys/arch/arm/imx/imx51_esdhc.c:1.4
--- src/sys/arch/arm/imx/imx51_esdhc.c:1.3 Tue May 26 05:11:33 2015
+++ src/sys/arch/arm/imx/imx51_esdhc.c Wed Jun 6 01:49:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_esdhc.c,v 1.3 2015/05/26 05:11:33 hkenken Exp $ */
+/* $NetBSD: imx51_esdhc.c,v 1.4 2018/06/06 01:49:07 maya Exp $ */
/*-
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_esdhc.c,v 1.3 2015/05/26 05:11:33 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_esdhc.c,v 1.4 2018/06/06 01:49:07 maya Exp $");
#include "opt_imx.h"
@@ -105,16 +105,16 @@ sdhc_attach(device_t parent, device_t se
switch (aa->aa_addr) {
case ESDHC1_BASE:
perclk = imx51_get_clock(IMX51CLK_ESDHC1_CLK_ROOT);
- break;;
+ break;
case ESDHC2_BASE:
perclk = imx51_get_clock(IMX51CLK_ESDHC2_CLK_ROOT);
- break;;
+ break;
case ESDHC3_BASE:
perclk = imx51_get_clock(IMX51CLK_ESDHC3_CLK_ROOT);
- break;;
+ break;
case ESDHC4_BASE:
perclk = imx51_get_clock(IMX51CLK_ESDHC4_CLK_ROOT);
- break;;
+ break;
}
sc->sc_sdhc.sc_clkbase = perclk / 1000;
sc->sc_sdhc.sc_flags |= SDHC_FLAG_USE_DMA;
Index: src/sys/arch/cobalt/cobalt/interrupt.c
diff -u src/sys/arch/cobalt/cobalt/interrupt.c:1.8 src/sys/arch/cobalt/cobalt/interrupt.c:1.9
--- src/sys/arch/cobalt/cobalt/interrupt.c:1.8 Sat Jan 20 13:56:08 2018
+++ src/sys/arch/cobalt/cobalt/interrupt.c Wed Jun 6 01:49:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.8 2018/01/20 13:56:08 skrll Exp $ */
+/* $NetBSD: interrupt.c,v 1.9 2018/06/06 01:49:07 maya Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.8 2018/01/20 13:56:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.9 2018/06/06 01:49:07 maya Exp $");
#define __INTR_PRIVATE
@@ -174,7 +174,7 @@ intr_init(void)
/*
* Initialize ICU interrupts.
*/
- icu_bst = &cobalt_bs;;
+ icu_bst = &cobalt_bs;
bus_space_map(icu_bst, PCIB_BASE + IO_ICU1, IO_ICUSIZE, 0, &icu1_bsh);
bus_space_map(icu_bst, PCIB_BASE + IO_ICU2, IO_ICUSIZE, 0, &icu2_bsh);
bus_space_map(icu_bst, PCIB_BASE + IO_ELCR, IO_ELCRSIZE, 0, &elcr_bsh);
Index: src/sys/arch/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.18 src/sys/arch/evbmips/rmixl/machdep.c:1.19
--- src/sys/arch/evbmips/rmixl/machdep.c:1.18 Thu Dec 22 14:47:57 2016
+++ src/sys/arch/evbmips/rmixl/machdep.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.18 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.19 2018/06/06 01:49:08 maya Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2018/06/06 01:49:08 maya Exp $");
#define __INTR_PRIVATE
@@ -888,7 +888,7 @@ rmixl_get_wakeup_info(struct rmixl_confi
wip = (volatile rmixlfw_cpu_wakeup_info_t *)
(intptr_t)scratch_7;
- end = wip->entry.gp - (wip->master_cpu & (PAGE_SIZE * 2));;
+ end = wip->entry.gp - (wip->master_cpu & (PAGE_SIZE * 2));
if (wip->valid == 1) {
rcp->rc_cpu_wakeup_end = (const void *)end;
Index: src/sys/arch/luna68k/dev/omrasops.c
diff -u src/sys/arch/luna68k/dev/omrasops.c:1.19 src/sys/arch/luna68k/dev/omrasops.c:1.20
--- src/sys/arch/luna68k/dev/omrasops.c:1.19 Sat Oct 4 16:58:17 2014
+++ src/sys/arch/luna68k/dev/omrasops.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: omrasops.c,v 1.19 2014/10/04 16:58:17 tsutsui Exp $ */
+/* $NetBSD: omrasops.c,v 1.20 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.19 2014/10/04 16:58:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.20 2018/06/06 01:49:08 maya Exp $");
/*
* Designed speficically for 'm68k bitorder';
@@ -316,7 +316,7 @@ om1_erasecols(void *cookie, int row, int
int scanspan, startx, height, width, align, w, y;
uint32_t lmask, rmask, fill;
- scanspan = ri->ri_stride;;
+ scanspan = ri->ri_stride;
y = ri->ri_font->fontheight * row;
startx = ri->ri_font->fontwidth * startcol;
height = ri->ri_font->fontheight;
@@ -364,7 +364,7 @@ om4_erasecols(void *cookie, int row, int
int scanspan, startx, height, width, align, w, y, fg, bg;
uint32_t lmask, rmask, fill0, fill1, fill2, fill3;
- scanspan = ri->ri_stride;;
+ scanspan = ri->ri_stride;
y = ri->ri_font->fontheight * row;
startx = ri->ri_font->fontwidth * startcol;
height = ri->ri_font->fontheight;
Index: src/sys/arch/mips/mips/pmap_machdep.c
diff -u src/sys/arch/mips/mips/pmap_machdep.c:1.21 src/sys/arch/mips/mips/pmap_machdep.c:1.22
--- src/sys/arch/mips/mips/pmap_machdep.c:1.21 Fri Jun 9 06:39:24 2017
+++ src/sys/arch/mips/mips/pmap_machdep.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_machdep.c,v 1.21 2017/06/09 06:39:24 skrll Exp $ */
+/* $NetBSD: pmap_machdep.c,v 1.22 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.21 2017/06/09 06:39:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.22 2018/06/06 01:49:08 maya Exp $");
/*
* Manages physical address maps.
@@ -525,7 +525,7 @@ pmap_md_alloc_ephemeral_address_space(st
#endif
|| MIPS_CACHE_VIRTUAL_ALIAS
|| MIPS_ICACHE_VIRTUAL_ALIAS) {
- vsize_t size = max(mci->mci_pdcache_way_size, mci->mci_picache_way_size);;
+ vsize_t size = max(mci->mci_pdcache_way_size, mci->mci_picache_way_size);
const u_int __diagused mask = pmap_page_cache_alias_mask;
ci->ci_pmap_dstbase = uvm_km_alloc(kernel_map, size, size,
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.134 src/sys/arch/sparc64/sparc64/cpu.c:1.135
--- src/sys/arch/sparc64/sparc64/cpu.c:1.134 Fri Jan 19 12:47:41 2018
+++ src/sys/arch/sparc64/sparc64/cpu.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.134 2018/01/19 12:47:41 nakayama Exp $ */
+/* $NetBSD: cpu.c,v 1.135 2018/06/06 01:49:08 maya Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.134 2018/01/19 12:47:41 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.135 2018/06/06 01:49:08 maya Exp $");
#include "opt_multiprocessor.h"
@@ -160,7 +160,7 @@ static int
cpu_cache_info_sun4v(const char *type, int level, const char *prop)
{
int idx = 0;
- uint64_t val = 0;;
+ uint64_t val = 0;
idx = mdesc_find_node_by_idx(idx, "cache");
while (idx != -1 && val == 0) {
const char *name = mdesc_name_by_idx(idx);
Index: src/sys/arch/usermode/target/i386/cpu_i386.c
diff -u src/sys/arch/usermode/target/i386/cpu_i386.c:1.6 src/sys/arch/usermode/target/i386/cpu_i386.c:1.7
--- src/sys/arch/usermode/target/i386/cpu_i386.c:1.6 Tue May 22 14:38:10 2018
+++ src/sys/arch/usermode/target/i386/cpu_i386.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_i386.c,v 1.6 2018/05/22 14:38:10 reinoud Exp $ */
+/* $NetBSD: cpu_i386.c,v 1.7 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v 1.6 2018/05/22 14:38:10 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v 1.7 2018/06/06 01:49:08 maya Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v
#include "opt_exec.h"
#if 0
-static void dump_regs(register_t *reg);;
+static void dump_regs(register_t *reg);
static void
dump_regs(register_t *reg)
Index: src/sys/arch/usermode/target/x86_64/cpu_x86_64.c
diff -u src/sys/arch/usermode/target/x86_64/cpu_x86_64.c:1.5 src/sys/arch/usermode/target/x86_64/cpu_x86_64.c:1.6
--- src/sys/arch/usermode/target/x86_64/cpu_x86_64.c:1.5 Tue May 22 14:38:10 2018
+++ src/sys/arch/usermode/target/x86_64/cpu_x86_64.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_x86_64.c,v 1.5 2018/05/22 14:38:10 reinoud Exp $ */
+/* $NetBSD: cpu_x86_64.c,v 1.6 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_x86_64.c,v 1.5 2018/05/22 14:38:10 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_x86_64.c,v 1.6 2018/06/06 01:49:08 maya Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_x86_64.c
#include <machine/mcontext.h>
#if 0
-static void dump_regs(register_t *reg);;
+static void dump_regs(register_t *reg);
static void
dump_regs(register_t *reg)
Index: src/sys/arch/vax/vsa/lcg.c
diff -u src/sys/arch/vax/vsa/lcg.c:1.3 src/sys/arch/vax/vsa/lcg.c:1.4
--- src/sys/arch/vax/vsa/lcg.c:1.3 Thu Feb 8 09:05:18 2018
+++ src/sys/arch/vax/vsa/lcg.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lcg.c,v 1.3 2018/02/08 09:05:18 dholland Exp $ */
+/* $NetBSD: lcg.c,v 1.4 2018/06/06 01:49:08 maya Exp $ */
/*
* LCG accelerated framebuffer driver
* Copyright (c) 2003, 2004 Blaz Antonic
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.3 2018/02/08 09:05:18 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.4 2018/06/06 01:49:08 maya Exp $");
#define LCG_NO_ACCEL
@@ -271,7 +271,7 @@ void fifo_put(long data)
int fifo_fill(int iterations)
{
long status;
- int counter = 0;;
+ int counter = 0;
while (fifo_counter % 4)
fifo_put(0);
Index: src/sys/dev/acpi/wmi/wmi_hp.c
diff -u src/sys/dev/acpi/wmi/wmi_hp.c:1.10 src/sys/dev/acpi/wmi/wmi_hp.c:1.11
--- src/sys/dev/acpi/wmi/wmi_hp.c:1.10 Thu Jun 1 02:45:09 2017
+++ src/sys/dev/acpi/wmi/wmi_hp.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_hp.c,v 1.10 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: wmi_hp.c,v 1.11 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.10 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.11 2018/06/06 01:49:08 maya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -720,7 +720,7 @@ sysctl_wmi_hp_set_als(SYSCTLFN_ARGS)
err = sysctl_lookup(SYSCTLFN_CALL(&node));
if (err != 0 || newp == NULL)
- return err;;
+ return err;
if (als < 0 || als > 1)
return EINVAL;
Index: src/sys/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.29 src/sys/dev/filemon/filemon.c:1.30
--- src/sys/dev/filemon/filemon.c:1.29 Thu Nov 30 20:25:55 2017
+++ src/sys/dev/filemon/filemon.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.c,v 1.29 2017/11/30 20:25:55 christos Exp $ */
+/* $NetBSD: filemon.c,v 1.30 2018/06/06 01:49:08 maya Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.29 2017/11/30 20:25:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.30 2018/06/06 01:49:08 maya Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -289,7 +289,7 @@ filemon_ioctl(struct file * fp, u_long c
struct proc *tp;
#ifdef DEBUG
- log(logLevel, "filemon_ioctl(%lu)", cmd);;
+ log(logLevel, "filemon_ioctl(%lu)", cmd);
#endif
/*
Index: src/sys/dev/i2c/ibmhawk.c
diff -u src/sys/dev/i2c/ibmhawk.c:1.5 src/sys/dev/i2c/ibmhawk.c:1.6
--- src/sys/dev/i2c/ibmhawk.c:1.5 Wed May 9 02:46:22 2018
+++ src/sys/dev/i2c/ibmhawk.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ibmhawk.c,v 1.5 2018/05/09 02:46:22 thorpej Exp $ */
+/* $NetBSD: ibmhawk.c,v 1.6 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -210,7 +210,7 @@ static int
ibmhawk_request(struct ibmhawk_softc *sc, uint8_t request,
ibmhawk_response_t *response)
{
- int i, error, retries;;
+ int i, error, retries;
uint8_t buf[sizeof(ibmhawk_response_t)+3], dummy;
error = EIO; /* Fail until we have a valid response. */
Index: src/sys/dev/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.14 src/sys/dev/pci/coram.c:1.15
--- src/sys/dev/pci/coram.c:1.14 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/coram.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.14 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: coram.c,v 1.15 2018/06/06 01:49:08 maya Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.14 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.15 2018/06/06 01:49:08 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -714,7 +714,7 @@ coram_dtv_get_status(void *cookie)
if (sc->sc_demod == NULL)
return ENXIO;
- return cx24227_get_dtv_status(sc->sc_demod);;
+ return cx24227_get_dtv_status(sc->sc_demod);
}
static uint16_t
Index: src/sys/dev/pci/cy82c693.c
diff -u src/sys/dev/pci/cy82c693.c:1.9 src/sys/dev/pci/cy82c693.c:1.10
--- src/sys/dev/pci/cy82c693.c:1.9 Thu Mar 20 06:48:54 2014
+++ src/sys/dev/pci/cy82c693.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cy82c693.c,v 1.9 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: cy82c693.c,v 1.10 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.9 2014/03/20 06:48:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.10 2018/06/06 01:49:08 maya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -78,13 +78,13 @@ cy82c693_init(bus_space_tag_t iot)
mutex_spin_enter(&cyhc_slock);
if (cyhc_initialized) {
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
KASSERT(bus_space_is_equal(iot, cyhc_handle.cyhc_iot));
return &cyhc_handle;
}
if (bus_space_map(iot, CYHC_CONFIG_ADDR, 2, 0, &ioh) != 0) {
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
return NULL;
}
@@ -93,7 +93,7 @@ cy82c693_init(bus_space_tag_t iot)
cyhc_initialized = 1;
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
return &cyhc_handle;
}
@@ -106,14 +106,14 @@ cy82c693_read(const struct cy82c693_hand
mutex_spin_enter(&cyhc_slock);
if (cyhc_initialized == 0) {
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
panic("cy82c693_read");
}
bus_space_write_1(cyhc->cyhc_iot, cyhc->cyhc_ioh, 0, reg);
rv = bus_space_read_1(cyhc->cyhc_iot, cyhc->cyhc_ioh, 1);
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
return rv;
}
@@ -125,12 +125,12 @@ cy82c693_write(const struct cy82c693_han
mutex_spin_enter(&cyhc_slock);
if (cyhc_initialized == 0) {
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
panic("cy82c693_write");
}
bus_space_write_1(cyhc->cyhc_iot, cyhc->cyhc_ioh, 0, reg);
bus_space_write_1(cyhc->cyhc_iot, cyhc->cyhc_ioh, 1, val);
- mutex_spin_exit(&cyhc_slock);;
+ mutex_spin_exit(&cyhc_slock);
}
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.79 src/sys/dev/pci/if_iwm.c:1.80
--- src/sys/dev/pci/if_iwm.c:1.79 Tue Jun 5 12:17:18 2018
+++ src/sys/dev/pci/if_iwm.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.79 2018/06/05 12:17:18 knakahara Exp $ */
+/* $NetBSD: if_iwm.c,v 1.80 2018/06/06 01:49:08 maya Exp $ */
/* OpenBSD: if_iwm.c,v 1.148 2016/11/19 21:07:08 stsp Exp */
#define IEEE80211_NO_HT
/*
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.79 2018/06/05 12:17:18 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.80 2018/06/06 01:49:08 maya Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -7729,7 +7729,7 @@ static int
iwm_preinit(struct iwm_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
- struct ifnet *ifp = IC2IFP(&sc->sc_ic);;
+ struct ifnet *ifp = IC2IFP(&sc->sc_ic);
int err;
if (ISSET(sc->sc_flags, IWM_FLAG_ATTACHED))
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.94 src/sys/dev/pci/radeonfb.c:1.95
--- src/sys/dev/pci/radeonfb.c:1.94 Wed Jan 24 05:35:58 2018
+++ src/sys/dev/pci/radeonfb.c Wed Jun 6 01:49:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.94 2018/01/24 05:35:58 riastradh Exp $ */
+/* $NetBSD: radeonfb.c,v 1.95 2018/06/06 01:49:08 maya Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.94 2018/01/24 05:35:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.95 2018/06/06 01:49:08 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -4201,7 +4201,7 @@ radeonfb_switch_backlight(struct radeonf
static int
radeonfb_set_backlight(struct radeonfb_display *dp, int level)
{
- struct radeonfb_softc *sc = dp->rd_softc;;
+ struct radeonfb_softc *sc = dp->rd_softc;
int rlevel, s;
uint32_t lvds;
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.258 src/sys/dev/usb/ehci.c:1.259
--- src/sys/dev/usb/ehci.c:1.258 Mon Apr 9 16:21:10 2018
+++ src/sys/dev/usb/ehci.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.258 2018/04/09 16:21:10 jakllsch Exp $ */
+/* $NetBSD: ehci.c,v 1.259 2018/06/06 01:49:09 maya Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.258 2018/04/09 16:21:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.259 2018/06/06 01:49:09 maya Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -4256,8 +4256,8 @@ ehci_device_fs_isoc_transfer(struct usbd
KASSERT(err == USBD_NORMAL_COMPLETION);
- struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);;
- struct usbd_device *dev = xfer->ux_pipe->up_dev;;
+ struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);
+ struct usbd_device *dev = xfer->ux_pipe->up_dev;
struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
ehci_soft_sitd_t *sitd;
usb_dma_t *dma_buf;
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.280 src/sys/dev/usb/ohci.c:1.281
--- src/sys/dev/usb/ohci.c:1.280 Mon Apr 9 16:21:11 2018
+++ src/sys/dev/usb/ohci.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.280 2018/04/09 16:21:11 jakllsch Exp $ */
+/* $NetBSD: ohci.c,v 1.281 2018/06/06 01:49:09 maya Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.280 2018/04/09 16:21:11 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.281 2018/06/06 01:49:09 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2893,7 +2893,7 @@ ohci_device_bulk_init(struct usbd_xfer *
{
ohci_softc_t *sc = OHCI_XFER2SC(xfer);
int len = xfer->ux_bufsize;
- int endpt = xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress;;
+ int endpt = xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress;
int isread = UE_GET_DIR(endpt) == UE_DIR_IN;
int err;
@@ -3091,7 +3091,7 @@ ohci_device_intr_init(struct usbd_xfer *
struct ohci_xfer *ox = OHCI_XFER2OXFER(xfer);
ohci_softc_t *sc = OHCI_XFER2SC(xfer);
int len = xfer->ux_bufsize;
- int endpt = xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress;;
+ int endpt = xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress;
int isread = UE_GET_DIR(endpt) == UE_DIR_IN;
int err;
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.140 src/sys/fs/udf/udf_subr.c:1.141
--- src/sys/fs/udf/udf_subr.c:1.140 Mon May 28 21:04:38 2018
+++ src/sys/fs/udf/udf_subr.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.140 2018/05/28 21:04:38 chs Exp $ */
+/* $NetBSD: udf_subr.c,v 1.141 2018/06/06 01:49:09 maya Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.140 2018/05/28 21:04:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.141 2018/06/06 01:49:09 maya Exp $");
#endif /* not lint */
@@ -5889,7 +5889,7 @@ udf_newvnode(struct mount *mp, struct vn
gid = parent_gid;
udf_setownership(udf_node, uid, gid);
- *key_len = sizeof(udf_node->loc.loc);;
+ *key_len = sizeof(udf_node->loc.loc);
*new_key = &udf_node->loc.loc;
return 0;
Index: src/sys/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.109 src/sys/net/if_strip.c:1.110
--- src/sys/net/if_strip.c:1.109 Fri Apr 20 09:56:22 2018
+++ src/sys/net/if_strip.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_strip.c,v 1.109 2018/04/20 09:56:22 knakahara Exp $ */
+/* $NetBSD: if_strip.c,v 1.110 2018/06/06 01:49:09 maya Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.109 2018/04/20 09:56:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.110 2018/06/06 01:49:09 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1268,7 +1268,7 @@ int
stripioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct ifaddr *ifa = (struct ifaddr *)data;
- struct ifreq *ifr = (struct ifreq *)data;;
+ struct ifreq *ifr = (struct ifreq *)data;
int s, error = 0;
s = splnet();
Index: src/sys/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.105 src/sys/opencrypto/crypto.c:1.106
--- src/sys/opencrypto/crypto.c:1.105 Mon Jan 8 23:34:56 2018
+++ src/sys/opencrypto/crypto.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto.c,v 1.105 2018/01/08 23:34:56 knakahara Exp $ */
+/* $NetBSD: crypto.c,v 1.106 2018/06/06 01:49:09 maya Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.105 2018/01/08 23:34:56 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.106 2018/06/06 01:49:09 maya Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -1794,7 +1794,7 @@ crypto_done(struct cryptop *crp)
{
int wasempty;
struct crypto_crp_ret_qs *qs;
- struct crypto_crp_ret_q *crp_ret_q;;
+ struct crypto_crp_ret_q *crp_ret_q;
qs = crypto_get_crp_ret_qs(crp->reqcpu);
crp_ret_q = &qs->crp_ret_q;
@@ -1840,7 +1840,7 @@ crypto_kdone(struct cryptkop *krp)
} else {
int wasempty;
struct crypto_crp_ret_qs *qs;
- struct crypto_crp_ret_kq *crp_ret_kq;;
+ struct crypto_crp_ret_kq *crp_ret_kq;
qs = crypto_get_crp_ret_qs(krp->reqcpu);
crp_ret_kq = &qs->crp_ret_kq;
@@ -2048,8 +2048,8 @@ static void
cryptoret_softint(void *arg __unused)
{
struct crypto_crp_ret_qs *qs;
- struct crypto_crp_ret_q *crp_ret_q;;
- struct crypto_crp_ret_kq *crp_ret_kq;;
+ struct crypto_crp_ret_q *crp_ret_q;
+ struct crypto_crp_ret_kq *crp_ret_kq;
qs = crypto_get_crp_ret_qs(curcpu());
crp_ret_q = &qs->crp_ret_q;
Index: src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.7 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.8
--- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.7 Tue Jan 26 23:12:15 2016
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_at_mainbus.c,v 1.7 2016/01/26 23:12:15 pooka Exp $ */
+/* $NetBSD: pci_at_mainbus.c,v 1.8 2018/06/06 01:49:09 maya Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.7 2016/01/26 23:12:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.8 2018/06/06 01:49:09 maya Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -81,7 +81,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERM
pba.pba_dmat64 = (void *)0x40;
#endif
pba.pba_flags = PCI_FLAGS_MEM_OKAY |
- PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;;
+ PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
#ifdef RUMPCOMP_USERFEATURE_PCI_IOSPACE
int error;
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.275 src/sys/ufs/lfs/lfs_segment.c:1.276
--- src/sys/ufs/lfs/lfs_segment.c:1.275 Sun Aug 20 00:03:12 2017
+++ src/sys/ufs/lfs/lfs_segment.c Wed Jun 6 01:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.275 2017/08/20 00:03:12 maya Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.276 2018/06/06 01:49:09 maya Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.275 2017/08/20 00:03:12 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.276 2018/06/06 01:49:09 maya Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -499,7 +499,7 @@ lfs_writevnodes_selector(void *cl, struc
}
if (op == VN_EMPTY && !VPISEMPTY(vp)) {
vndebug(vp,"empty");
- return false;;
+ return false;
}
if (op == VN_CLEAN && ip->i_number != LFS_IFILE_INUM &&
vp != c->fs->lfs_flushvp && !(ip->i_state & IN_CLEANING)) {
