svn commit: r216227 - in head: libexec/mknetid sys/arm/at91 sys/dev/bwn sys/dev/mps sys/dev/siba sys/dev/sis sys/mips/mips usr.sbin/ac

[Kevin Lo]

Author: kevlo
Date: Mon Dec  6 10:24:06 2010
New Revision: 216227
URL: http://svn.freebsd.org/changeset/base/216227

Log:
  Fix double ;;

Modified:
  head/libexec/mknetid/parse_group.c
  head/sys/arm/at91/at91_pmc.c
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/mps/mps.c
  head/sys/dev/siba/siba_bwn.c
  head/sys/dev/sis/if_sisreg.h
  head/sys/mips/mips/mp_machdep.c
  head/usr.sbin/ac/ac.c

Modified: head/libexec/mknetid/parse_group.c
==============================================================================
--- head/libexec/mknetid/parse_group.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/libexec/mknetid/parse_group.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -126,7 +126,7 @@ grscan(int search, int gid)
 		if (_gr_group.gr_name[0] == '+')
 			continue;
 		if ((_gr_group.gr_passwd = strsep(&bp, ":\n")) == NULL)
-			break;;
+			break;
 		if (!(cp = strsep(&bp, ":\n")))
 			continue;
 		_gr_group.gr_gid = atoi(cp);

Modified: head/sys/arm/at91/at91_pmc.c
==============================================================================
--- head/sys/arm/at91/at91_pmc.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/sys/arm/at91/at91_pmc.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -325,7 +325,7 @@ at91_pmc_clock_disable(struct at91_pmc_c
 static int
 at91_pmc_pll_rate(struct at91_pmc_clock *clk, uint32_t reg)
 {
-	uint32_t mul, div, freq;;
+	uint32_t mul, div, freq;
 
 	freq = clk->parent->hz;
 	div = (reg >> clk->pll_div_shift) & clk->pll_div_mask;

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/sys/dev/bwn/if_bwn.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -2882,7 +2882,7 @@ bwn_set_channel(struct ieee80211com *ic)
 
 	error = bwn_switch_band(sc, ic->ic_curchan);
 	if (error)
-		goto fail;;
+		goto fail;
 	bwn_mac_suspend(mac);
 	bwn_set_txretry(mac, BWN_RETRY_SHORT, BWN_RETRY_LONG);
 	chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
@@ -8260,7 +8260,7 @@ bwn_switch_band(struct bwn_softc *sc, st
 	device_printf(sc->sc_dev, "switching to %s-GHz band\n",
 	    IEEE80211_IS_CHAN_2GHZ(chan) ? "2" : "5");
 
-	down_dev = sc->sc_curmac;;
+	down_dev = sc->sc_curmac;
 	status = down_dev->mac_status;
 	if (status >= BWN_MAC_STATUS_STARTED)
 		bwn_core_stop(down_dev);

Modified: head/sys/dev/mps/mps.c
==============================================================================
--- head/sys/dev/mps/mps.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/sys/dev/mps/mps.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -1282,7 +1282,7 @@ mps_dispatch_event(struct mps_softc *sc,
     MPI2_EVENT_NOTIFICATION_REPLY *reply)
 {
 	struct mps_event_handle *eh;
-	int event, handled = 0;;
+	int event, handled = 0;
 
 	event = reply->Event;
 	TAILQ_FOREACH(eh, &sc->event_list, eh_list) {

Modified: head/sys/dev/siba/siba_bwn.c
==============================================================================
--- head/sys/dev/siba/siba_bwn.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/sys/dev/siba/siba_bwn.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -326,7 +326,7 @@ static int
 siba_bwn_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
 {
 	struct siba_dev_softc *sd;
-	struct siba_softc *siba;;
+	struct siba_softc *siba;
 
 	sd = device_get_ivars(child);
 	siba = sd->sd_bus;

Modified: head/sys/dev/sis/if_sisreg.h
==============================================================================
--- head/sys/dev/sis/if_sisreg.h	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/sys/dev/sis/if_sisreg.h	Mon Dec  6 10:24:06 2010	(r216227)
@@ -497,7 +497,7 @@ struct sis_softc {
 	int			sis_tx_prod;
 	int			sis_tx_cons;
 	int			sis_tx_cnt;
-	int			sis_rx_cons;;
+	int			sis_rx_cons;
 	bus_addr_t		sis_rx_paddr;
 	bus_addr_t		sis_tx_paddr;
 	struct callout		sis_stat_ch;

Modified: head/sys/mips/mips/mp_machdep.c
==============================================================================
--- head/sys/mips/mips/mp_machdep.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/sys/mips/mips/mp_machdep.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -164,7 +164,7 @@ mips_ipi_handler(void *arg)
 			break;
 		case IPI_HARDCLOCK:
 			CTR1(KTR_SMP, "%s: IPI_HARDCLOCK", __func__);
-			hardclockintr();;
+			hardclockintr();
 			break;
 		default:
 			panic("Unknown IPI 0x%0x on cpu %d", ipi, curcpu);

Modified: head/usr.sbin/ac/ac.c
==============================================================================
--- head/usr.sbin/ac/ac.c	Mon Dec  6 09:39:36 2010	(r216226)
+++ head/usr.sbin/ac/ac.c	Mon Dec  6 10:24:06 2010	(r216227)
@@ -584,7 +584,7 @@ ac(const char *file)
 	if (!(Flags & AC_W))
 		usht.ut_tv.tv_sec = time(NULL);
 	else
-		usht.ut_tv.tv_sec = ut_timecopy;;
+		usht.ut_tv.tv_sec = ut_timecopy;
 	usht.ut_type = SHUTDOWN_TIME;
 
 	if (Flags & AC_D) {