Fix the remaining ';;'s in sys/

diff --git a/sys/arch/armv7/imx/imxgpio.c b/sys/arch/armv7/imx/imxgpio.c
index 995a4e2..69a7a20 100644 (file)
--- a/sys/arch/armv7/imx/imxgpio.c
+++ b/sys/arch/armv7/imx/imxgpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxgpio.c,v 1.11 2016/08/06 18:12:13 patrick Exp $ */
+/* $OpenBSD: imxgpio.c,v 1.12 2017/06/22 11:34:51 tom Exp $ */
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -198,7 +198,7 @@ imxgpio_get_pin(void *cookie, uint32_t *cells)
        reg &= (1 << pin);
        val = (reg >> pin) & 1;
        if (flags & GPIO_ACTIVE_LOW)
-               val = !val;;
+               val = !val;
        return val;
 }
 

diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index b08c228..3d1e8aa 100644 (file)
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mesh.c,v 1.32 2013/12/06 21:03:05 deraadt Exp $       */
+/*     $OpenBSD: mesh.c,v 1.33 2017/06/22 11:34:51 tom Exp $   */
 /*     $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $  */
 
 /*-
@@ -1050,7 +1050,7 @@ mesh_scb_free(void *xsc, void *xscb)
 void
 mesh_scsi_cmd(struct scsi_xfer *xs)
 {
-       struct scsi_link *sc_link = xs->sc_link;;
+       struct scsi_link *sc_link = xs->sc_link;
        struct mesh_softc *sc = sc_link->adapter_softc;
        struct mesh_scb *scb;
        u_int flags;

diff --git a/sys/arch/sh/dev/shpcic.c b/sys/arch/sh/dev/shpcic.c
index f5b1989..7b3ca89 100644 (file)
--- a/sys/arch/sh/dev/shpcic.c
+++ b/sys/arch/sh/dev/shpcic.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: shpcic.c,v 1.12 2010/12/04 17:06:32 miod Exp $        */
+/*     $OpenBSD: shpcic.c,v 1.13 2017/06/22 11:34:51 tom Exp $ */
 /*     $NetBSD: shpcic.c,v 1.10 2005/12/24 20:07:32 perry Exp $        */
 
 /*
@@ -248,7 +248,7 @@ shpcic_attach(struct device *parent, struct device *self, void *aux)
        sc->sc_membus_space.bus_io = 0;
        sc->sc_iobus_space.bus_base = SH4_PCIC_IO; /* XXX */
        sc->sc_iobus_space.bus_size =  SH4_PCIC_IO_SIZE;
-       sc->sc_iobus_space.bus_io = 1;;
+       sc->sc_iobus_space.bus_io = 1;
 
        io_ex = extent_create("pciio", 0, 0xffffffff, M_DEVBUF, NULL, 0,
            EX_NOWAIT | EX_FILLED);

diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 733b005..b2d1ddf 100644 (file)
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_vlan.c,v 1.173 2017/05/31 05:14:51 dlg Exp $       */
+/*     $OpenBSD: if_vlan.c,v 1.174 2017/06/22 11:34:51 tom Exp $       */
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -760,7 +760,7 @@ vlan_iff(struct ifvlan *ifv)
 int
 vlan_setlladdr(struct ifvlan *ifv, struct ifreq *ifr)
 {
-       struct ifnet *ifp = &ifv->ifv_if;;
+       struct ifnet *ifp = &ifv->ifv_if;
        struct ifnet *ifp0;
        uint8_t lladdr[ETHER_ADDR_LEN];
        int flag;

diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index fc6f5a1..5e3a0c2 100644 (file)
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_carp.c,v 1.313 2017/06/19 17:58:49 bluhm Exp $     */
+/*     $OpenBSD: ip_carp.c,v 1.314 2017/06/22 11:34:51 tom Exp $       */
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -2338,7 +2338,7 @@ carp_start(struct ifnet *ifp)
                        uint8_t *esrc;
 
                        eh = mtod(m, struct ether_header *);
-                       esrc = ((struct arpcom*)ifp->if_carpdev)->ac_enaddr;;
+                       esrc = ((struct arpcom*)ifp->if_carpdev)->ac_enaddr;
                        memcpy(eh->ether_shost, esrc, sizeof(eh->ether_shost));
                }