Date: Wed, 2 Nov 2022 15:36:33 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 21cc0918c779 - main - sys: Nuke double-semicolons Message-ID: <202211021536.2A2FaXC5036985@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=21cc0918c779fce7c276b6dcb9e474b90d9293ac commit 21cc0918c779fce7c276b6dcb9e474b90d9293ac Author: Elliott Mitchell <ehem+freebsd@m5p.com> AuthorDate: 2021-08-16 22:51:38 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2022-11-02 15:34:20 +0000 sys: Nuke double-semicolons A distinct number of double-semicolons have ended up in FreeBSD. Take a pass at getting rid of many of these harmless typos. Reviewed by: emaste, rrs Pull Request: https://github.com/freebsd/freebsd-src/pull/609 Differential Revision: https://reviews.freebsd.org/D31716 --- sys/arm/mv/mv_ap806_sei.c | 2 +- sys/arm64/nvidia/tegra210/max77620.c | 2 +- sys/compat/linux/linux_ioctl.c | 2 +- sys/dev/axgbe/if_axgbe_pci.c | 2 +- sys/dev/e1000/if_em.c | 2 +- sys/dev/etherswitch/felix/felix.c | 2 +- sys/dev/fdt/simple_mfd.c | 2 +- sys/dev/netmap/netmap_kern.h | 2 +- sys/dev/ocs_fc/ocs_domain.h | 2 +- sys/netinet6/ip6_output.c | 2 +- sys/netpfil/ipfw/dn_aqm_codel.h | 2 +- sys/sys/unpcb.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/arm/mv/mv_ap806_sei.c b/sys/arm/mv/mv_ap806_sei.c index e5732d70e625..d55b4418dd13 100644 --- a/sys/arm/mv/mv_ap806_sei.c +++ b/sys/arm/mv/mv_ap806_sei.c @@ -367,7 +367,7 @@ mv_ap806_sei_attach(device_t dev) if (rv != 0) goto fail; /* XXX deregister ISRCs */ } - xref = OF_xref_from_node(node);; + xref = OF_xref_from_node(node); if (intr_pic_register(dev, xref) == NULL) { device_printf(dev, "Cannot register SEI\n"); rv = ENXIO; diff --git a/sys/arm64/nvidia/tegra210/max77620.c b/sys/arm64/nvidia/tegra210/max77620.c index fb0e43c517db..46b17f8445ae 100644 --- a/sys/arm64/nvidia/tegra210/max77620.c +++ b/sys/arm64/nvidia/tegra210/max77620.c @@ -291,7 +291,7 @@ max77620_encode_fps_period(struct max77620_softc *sc, int val) static int max77620_init(struct max77620_softc *sc) { - uint8_t mask, val, tmp;; + uint8_t mask, val, tmp; int i, rv; mask = 0; diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index ea391e56cd9a..deb84fd8dc93 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -285,7 +285,7 @@ linux_ioctl_disk(struct thread *td, struct linux_ioctl_args *args) fdrop(fp, td); if (error) return (error); - blksize64 = mediasize;; + blksize64 = mediasize; return (copyout(&blksize64, (void *)args->arg, sizeof(blksize64))); case LINUX_BLKSSZGET: diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index 21823151f74e..4b0bdaa030a6 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -588,7 +588,7 @@ xgbe_init_all_fptrs(struct xgbe_prv_data *pdata) static void axgbe_set_counts(if_ctx_t ctx) { - struct axgbe_if_softc *sc = iflib_get_softc(ctx);; + struct axgbe_if_softc *sc = iflib_get_softc(ctx); struct xgbe_prv_data *pdata = &sc->pdata; cpuset_t lcpus; int cpu_count, err; diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index f809c216edd7..b7a9052e0ec1 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -901,7 +901,7 @@ em_if_attach_pre(if_ctx_t ctx) * that it shall give MSI at least a try with other devices. */ if (hw->mac.type == e1000_82574) { - scctx->isc_msix_bar = pci_msix_table_bar(dev);; + scctx->isc_msix_bar = pci_msix_table_bar(dev); } else { scctx->isc_msix_bar = -1; scctx->isc_disable_msix = 1; diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c index e184e2a0fc16..466d26f247d7 100644 --- a/sys/dev/etherswitch/felix/felix.c +++ b/sys/dev/etherswitch/felix/felix.c @@ -197,7 +197,7 @@ felix_parse_port_fdt(felix_softc_t sc, phandle_t child, int *pport) return (0); } - sc->ports[port].fixed_port = true;; + sc->ports[port].fixed_port = true; if (OF_getencprop(node, "speed", &status, sizeof(status)) <= 0) { device_printf(sc->dev, diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c index da70bc823d03..3bb44e4f3aa8 100644 --- a/sys/dev/fdt/simple_mfd.c +++ b/sys/dev/fdt/simple_mfd.c @@ -89,7 +89,7 @@ simple_mfd_syscon_read_4(struct syscon *syscon, bus_size_t offset) uint32_t val; sc = device_get_softc(syscon->pdev); - SYSCON_ASSERT_LOCKED(sc);; + SYSCON_ASSERT_LOCKED(sc); val = bus_read_4(sc->mem_res, offset); return (val); } diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index f8d824f08ebb..acceaa9df540 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -2128,7 +2128,7 @@ struct netmap_monitor_adapter { * native netmap support. */ int generic_netmap_attach(struct ifnet *ifp); -int generic_rx_handler(struct ifnet *ifp, struct mbuf *m);; +int generic_rx_handler(struct ifnet *ifp, struct mbuf *m); int nm_os_catch_rx(struct netmap_generic_adapter *gna, int intercept); int nm_os_catch_tx(struct netmap_generic_adapter *gna, int intercept); diff --git a/sys/dev/ocs_fc/ocs_domain.h b/sys/dev/ocs_fc/ocs_domain.h index 1522a3c22687..4350a582a53d 100644 --- a/sys/dev/ocs_fc/ocs_domain.h +++ b/sys/dev/ocs_fc/ocs_domain.h @@ -87,5 +87,5 @@ extern void ocs_domain_attach(ocs_domain_t *domain, uint32_t s_id); extern int ocs_domain_post_event(ocs_domain_t *domain, ocs_sm_event_t, void *); extern int ocs_ddump_domain(ocs_textbuf_t *textbuf, ocs_domain_t *domain); -extern void __ocs_domain_attach_internal(ocs_domain_t *domain, uint32_t s_id);; +extern void __ocs_domain_attach_internal(ocs_domain_t *domain, uint32_t s_id); #endif diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 99c22343dced..ebb7f7bc6ed1 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -769,7 +769,7 @@ again: if (nh == NULL) { IP6STAT_INC(ip6s_noroute); /* No ifp in6_ifstat_inc(ifp, ifs6_out_discard); */ - error = EHOSTUNREACH;; + error = EHOSTUNREACH; goto bad; } diff --git a/sys/netpfil/ipfw/dn_aqm_codel.h b/sys/netpfil/ipfw/dn_aqm_codel.h index 077d427d02bf..a35668416bbb 100644 --- a/sys/netpfil/ipfw/dn_aqm_codel.h +++ b/sys/netpfil/ipfw/dn_aqm_codel.h @@ -139,7 +139,7 @@ codel_dequeue(struct dn_queue *q) aqm_time_t now; uint16_t ok_to_drop; - cst = q->aqm_status;; + cst = q->aqm_status; cprms = q->fs->aqmcfg; now = AQM_UNOW; diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h index 5944e83e96a0..09c6922dcb44 100644 --- a/sys/sys/unpcb.h +++ b/sys/sys/unpcb.h @@ -174,7 +174,7 @@ struct xunpgen { u_int xug_count; unp_gen_t xug_gen; so_gen_t xug_sogen; -} __aligned(8);; +} __aligned(8); #endif /* _SYS_SOCKETVAR_H_ */ #if defined(_KERNEL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211021536.2A2FaXC5036985>