From owner-svn-src-all@freebsd.org Tue Sep 1 21:17:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C34FA378FC8; Tue, 1 Sep 2020 21:17:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Jy4xLwz4HFB; Tue, 1 Sep 2020 21:17:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D6FC1FB1B; Tue, 1 Sep 2020 21:17:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LHcwN017691; Tue, 1 Sep 2020 21:17:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LHOHr017623; Tue, 1 Sep 2020 21:17:24 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012117.081LHOHr017623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:17:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365068 - in head/sys/arm: allwinner allwinner/a10 allwinner/a20 allwinner/clkng altera/socfpga amlogic/aml8726 annapurna/alpine arm broadcom/bcm2835 freescale freescale/imx freescale/v... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/arm: allwinner allwinner/a10 allwinner/a20 allwinner/clkng altera/socfpga amlogic/aml8726 annapurna/alpine arm broadcom/bcm2835 freescale freescale/imx freescale/vybrid include linux mv mv... X-SVN-Commit-Revision: 365068 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:17:38 -0000 Author: mjg Date: Tue Sep 1 21:17:24 2020 New Revision: 365068 URL: https://svnweb.freebsd.org/changeset/base/365068 Log: arm: clean up empty lines in .c and .h files Modified: head/sys/arm/allwinner/a10/a10_intc.c head/sys/arm/allwinner/a10_ahci.c head/sys/arm/allwinner/a10_codec.c head/sys/arm/allwinner/a10_hdmiaudio.c head/sys/arm/allwinner/a10_sramc.c head/sys/arm/allwinner/a20/a20_cpu_cfg.c head/sys/arm/allwinner/aw_dwc3.c head/sys/arm/allwinner/aw_machdep.c head/sys/arm/allwinner/aw_mmc.c head/sys/arm/allwinner/aw_rtc.c head/sys/arm/allwinner/aw_usbphy.c head/sys/arm/allwinner/aw_wdog.c head/sys/arm/allwinner/aw_wdog.h head/sys/arm/allwinner/axp209.c head/sys/arm/allwinner/axp209reg.h head/sys/arm/allwinner/axp81x.c head/sys/arm/allwinner/clkng/ccu_a10.c head/sys/arm/allwinner/clkng/ccu_a13.c head/sys/arm/allwinner/clkng/ccu_a31.c head/sys/arm/allwinner/clkng/ccu_a83t.c head/sys/arm/allwinner/if_emac.c head/sys/arm/altera/socfpga/socfpga_a10_manager.c head/sys/arm/altera/socfpga/socfpga_common.c head/sys/arm/amlogic/aml8726/aml8726_ccm.c head/sys/arm/amlogic/aml8726/aml8726_ccm.h head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c head/sys/arm/amlogic/aml8726/aml8726_fb.c head/sys/arm/amlogic/aml8726/aml8726_fb.h head/sys/arm/amlogic/aml8726/aml8726_gpio.c head/sys/arm/amlogic/aml8726/aml8726_i2c.c head/sys/arm/amlogic/aml8726/aml8726_mmc.c head/sys/arm/amlogic/aml8726/aml8726_mmc.h head/sys/arm/amlogic/aml8726/aml8726_mp.c head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h head/sys/arm/amlogic/aml8726/aml8726_rng.c head/sys/arm/amlogic/aml8726/aml8726_rtc.c head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c head/sys/arm/amlogic/aml8726/aml8726_wdt.c head/sys/arm/annapurna/alpine/alpine_ccu.c head/sys/arm/annapurna/alpine/alpine_nb_service.c head/sys/arm/arm/autoconf.c head/sys/arm/arm/bus_space_generic.c head/sys/arm/arm/busdma_machdep.c head/sys/arm/arm/cpufunc.c head/sys/arm/arm/cpuinfo.c head/sys/arm/arm/db_interface.c head/sys/arm/arm/db_trace.c head/sys/arm/arm/disassem.c head/sys/arm/arm/elf_machdep.c head/sys/arm/arm/gdb_machdep.c head/sys/arm/arm/generic_timer.c head/sys/arm/arm/gic.c head/sys/arm/arm/identcpu-v4.c head/sys/arm/arm/identcpu-v6.c head/sys/arm/arm/machdep.c head/sys/arm/arm/machdep_boot.c head/sys/arm/arm/machdep_ptrace.c head/sys/arm/arm/mpcore_timer.c head/sys/arm/arm/nexus.c head/sys/arm/arm/nexusvar.h head/sys/arm/arm/ofw_machdep.c head/sys/arm/arm/pl310.c head/sys/arm/arm/pmap-v4.c head/sys/arm/arm/pmap-v6.c head/sys/arm/arm/syscall.c head/sys/arm/arm/trap-v4.c head/sys/arm/arm/undefined.c head/sys/arm/arm/vfp.c head/sys/arm/arm/vm_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_audio.c head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c head/sys/arm/broadcom/bcm2835/bcm2835_fb.c head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c head/sys/arm/broadcom/bcm2835/bcm2835_intr.c head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_mbox.c head/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h head/sys/arm/broadcom/bcm2835/bcm2835_pwm.c head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c head/sys/arm/broadcom/bcm2835/bcm2838_pci.c head/sys/arm/broadcom/bcm2835/bcm2838_xhci.c head/sys/arm/freescale/fsl_ocotp.c head/sys/arm/freescale/imx/imx51_ccm.c head/sys/arm/freescale/imx/imx51_ccmreg.h head/sys/arm/freescale/imx/imx51_ipuv3.c head/sys/arm/freescale/imx/imx6_anatop.c head/sys/arm/freescale/imx/imx6_ccm.c head/sys/arm/freescale/imx/imx6_ccmreg.h head/sys/arm/freescale/imx/imx6_mp.c head/sys/arm/freescale/imx/imx6_ssi.c head/sys/arm/freescale/imx/imx6_usbphy.c head/sys/arm/freescale/imx/imx_console.c head/sys/arm/freescale/imx/imx_gpio.c head/sys/arm/freescale/imx/imx_iomux.c head/sys/arm/freescale/imx/imx_machdep.c head/sys/arm/freescale/imx/imx_machdep.h head/sys/arm/freescale/imx/imx_nop_usbphy.c head/sys/arm/freescale/imx/imx_wdogreg.h head/sys/arm/freescale/vybrid/vf_ccm.c head/sys/arm/freescale/vybrid/vf_ehci.c head/sys/arm/freescale/vybrid/vf_gpio.c head/sys/arm/freescale/vybrid/vf_i2c.c head/sys/arm/freescale/vybrid/vf_iomuxc.c head/sys/arm/freescale/vybrid/vf_port.c head/sys/arm/freescale/vybrid/vf_sai.c head/sys/arm/include/asm.h head/sys/arm/include/atomic-v4.h head/sys/arm/include/atomic-v6.h head/sys/arm/include/bus.h head/sys/arm/include/cpu-v4.h head/sys/arm/include/cpufunc.h head/sys/arm/include/cpuinfo.h head/sys/arm/include/elf.h head/sys/arm/include/frame.h head/sys/arm/include/pcb.h head/sys/arm/include/pcpu.h head/sys/arm/include/pl310.h head/sys/arm/include/pmap-v4.h head/sys/arm/include/profile.h head/sys/arm/include/ptrace.h head/sys/arm/include/swi.h head/sys/arm/include/undefined.h head/sys/arm/include/vfp.h head/sys/arm/linux/linux_proto.h head/sys/arm/mv/a37x0_gpio.c head/sys/arm/mv/armada/wdt.c head/sys/arm/mv/armada38x/armada38x_rtc.c head/sys/arm/mv/armada38x/pmsu.c head/sys/arm/mv/armadaxp/armadaxp.c head/sys/arm/mv/gpio.c head/sys/arm/mv/mv_ap806_clock.c head/sys/arm/mv/mv_ap806_gicp.c head/sys/arm/mv/mv_ap806_sei.c head/sys/arm/mv/mv_armv7_machdep.c head/sys/arm/mv/mv_common.c head/sys/arm/mv/mv_cp110_clock.c head/sys/arm/mv/mv_cp110_icu.c head/sys/arm/mv/mv_localbus.c head/sys/arm/mv/mv_pci_ctrl.c head/sys/arm/mv/mv_spi.c head/sys/arm/mv/mv_thermal.c head/sys/arm/mv/mvebu_gpio.c head/sys/arm/mv/mvebu_pinctrl.c head/sys/arm/mv/mvwin.h head/sys/arm/mv/timer.c head/sys/arm/nvidia/as3722_gpio.c head/sys/arm/nvidia/as3722_regulators.c head/sys/arm/nvidia/drm2/hdmi.h head/sys/arm/nvidia/drm2/tegra_bo.c head/sys/arm/nvidia/drm2/tegra_dc.c head/sys/arm/nvidia/drm2/tegra_dc_reg.h head/sys/arm/nvidia/drm2/tegra_drm.h head/sys/arm/nvidia/drm2/tegra_hdmi.c head/sys/arm/nvidia/drm2/tegra_hdmi_reg.h head/sys/arm/nvidia/drm2/tegra_host1x.c head/sys/arm/nvidia/tegra124/tegra124_car.c head/sys/arm/nvidia/tegra124/tegra124_car.h head/sys/arm/nvidia/tegra124/tegra124_clk_per.c head/sys/arm/nvidia/tegra124/tegra124_clk_pll.c head/sys/arm/nvidia/tegra124/tegra124_clk_super.c head/sys/arm/nvidia/tegra124/tegra124_coretemp.c head/sys/arm/nvidia/tegra124/tegra124_cpufreq.c head/sys/arm/nvidia/tegra124/tegra124_mp.c head/sys/arm/nvidia/tegra124/tegra124_mp.h head/sys/arm/nvidia/tegra124/tegra124_pmc.c head/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c head/sys/arm/nvidia/tegra_abpmisc.c head/sys/arm/nvidia/tegra_ahci.c head/sys/arm/nvidia/tegra_efuse.c head/sys/arm/nvidia/tegra_gpio.c head/sys/arm/nvidia/tegra_i2c.c head/sys/arm/nvidia/tegra_lic.c head/sys/arm/nvidia/tegra_mc.c head/sys/arm/nvidia/tegra_pcie.c head/sys/arm/nvidia/tegra_pinmux.c head/sys/arm/nvidia/tegra_rtc.c head/sys/arm/nvidia/tegra_soctherm.c head/sys/arm/nvidia/tegra_uart.c head/sys/arm/nvidia/tegra_usbphy.c head/sys/arm/nvidia/tegra_xhci.c head/sys/arm/rockchip/rk30xx_gpio.c head/sys/arm/rockchip/rk30xx_grf.c head/sys/arm/rockchip/rk30xx_machdep.c head/sys/arm/rockchip/rk30xx_pmu.c head/sys/arm/rockchip/rk30xx_wdog.h head/sys/arm/samsung/exynos/chrome_kb.c head/sys/arm/samsung/exynos/exynos5_ehci.c head/sys/arm/samsung/exynos/exynos5_i2c.c head/sys/arm/samsung/exynos/exynos5_pad.c head/sys/arm/samsung/exynos/exynos5_spi.c head/sys/arm/samsung/exynos/exynos5_xhci.c head/sys/arm/samsung/exynos/exynos_uart.c head/sys/arm/ti/aintc.c head/sys/arm/ti/am335x/am3359_cppi41.c head/sys/arm/ti/am335x/am335x_ecap.c head/sys/arm/ti/am335x/am335x_ehrpwm.c head/sys/arm/ti/am335x/am335x_lcd_syscons.c head/sys/arm/ti/am335x/am335x_reg.h head/sys/arm/ti/am335x/tda19988.c head/sys/arm/ti/clk/ti_clk_dpll.c head/sys/arm/ti/clk/ti_clk_dpll.h head/sys/arm/ti/clk/ti_clkctrl.c head/sys/arm/ti/cpsw/if_cpsw.c head/sys/arm/ti/omap4/omap4_prcm_clks.c head/sys/arm/ti/omap4/omap4_reg.h head/sys/arm/ti/omap4/omap4_scm_padconf.c head/sys/arm/ti/omap4/omap4_wugen.c head/sys/arm/ti/omap4/pandaboard/pandaboard.c head/sys/arm/ti/omap4/pandaboard/pandaboard.h head/sys/arm/ti/ti_adc.c head/sys/arm/ti/ti_edma3.c head/sys/arm/ti/ti_i2c.c head/sys/arm/ti/ti_omap4_cm.c head/sys/arm/ti/ti_pinmux.c head/sys/arm/ti/ti_pinmux.h head/sys/arm/ti/ti_prcm.c head/sys/arm/ti/ti_scm.c head/sys/arm/ti/ti_scm.h head/sys/arm/ti/ti_scm_syscon.c head/sys/arm/ti/ti_sdhci.c head/sys/arm/ti/ti_sdma.c head/sys/arm/ti/ti_smc.h head/sys/arm/ti/twl/twl.c head/sys/arm/ti/twl/twl_clks.c head/sys/arm/ti/twl/twl_clks.h head/sys/arm/ti/twl/twl_vreg.c head/sys/arm/ti/twl/twl_vreg.h head/sys/arm/ti/usb/omap_ehci.c head/sys/arm/ti/usb/omap_host.c head/sys/arm/ti/usb/omap_tll.c head/sys/arm/versatile/versatile_clcd.c head/sys/arm/versatile/versatile_common.c head/sys/arm/versatile/versatile_machdep.c head/sys/arm/xilinx/uart_dev_cdnc.c head/sys/arm/xilinx/zy7_devcfg.c head/sys/arm/xilinx/zy7_ehci.c head/sys/arm/xilinx/zy7_gpio.c head/sys/arm/xilinx/zy7_qspi.c head/sys/arm/xilinx/zy7_reg.h head/sys/arm/xilinx/zy7_spi.c Modified: head/sys/arm/allwinner/a10/a10_intc.c ============================================================================== --- head/sys/arm/allwinner/a10/a10_intc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10/a10_intc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -375,7 +375,6 @@ static device_method_t a10_aintc_methods[] = { DEVMETHOD(pic_post_filter, a10_intr_post_filter), DEVMETHOD(pic_post_ithread, a10_intr_post_ithread), DEVMETHOD(pic_pre_ithread, a10_intr_pre_ithread), - { 0, 0 } }; Modified: head/sys/arm/allwinner/a10_ahci.c ============================================================================== --- head/sys/arm/allwinner/a10_ahci.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_ahci.c Tue Sep 1 21:17:24 2020 (r365068) @@ -355,7 +355,7 @@ ahci_a10_attach(device_t dev) device_printf(dev, "Cannot enable clk gate\n"); goto fail; } - + /* Reset controller */ if ((error = ahci_a10_ctlr_reset(dev)) != 0) goto fail; Modified: head/sys/arm/allwinner/a10_codec.c ============================================================================== --- head/sys/arm/allwinner/a10_codec.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_codec.c Tue Sep 1 21:17:24 2020 (r365068) @@ -367,7 +367,6 @@ static kobj_method_t a10_mixer_methods[] = { }; MIXER_DECLARE(a10_mixer); - /* * H3 mixer interface */ @@ -620,7 +619,6 @@ static kobj_method_t h3_mixer_methods[] = { }; MIXER_DECLARE(h3_mixer); - /* * Channel interface */ @@ -1009,7 +1007,6 @@ static kobj_method_t a10codec_chan_methods[] = { KOBJMETHOD_END }; CHANNEL_DECLARE(a10codec_chan); - /* * Device interface Modified: head/sys/arm/allwinner/a10_hdmiaudio.c ============================================================================== --- head/sys/arm/allwinner/a10_hdmiaudio.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_hdmiaudio.c Tue Sep 1 21:17:24 2020 (r365068) @@ -126,7 +126,6 @@ static kobj_method_t a10hdmiaudio_mixer_methods[] = { }; MIXER_DECLARE(a10hdmiaudio_mixer); - /* * Channel interface */ @@ -344,7 +343,6 @@ static kobj_method_t a10hdmiaudio_chan_methods[] = { KOBJMETHOD_END }; CHANNEL_DECLARE(a10hdmiaudio_chan); - /* * Device interface Modified: head/sys/arm/allwinner/a10_sramc.c ============================================================================== --- head/sys/arm/allwinner/a10_sramc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_sramc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -68,7 +68,6 @@ static struct a10_sramc_softc *a10_sramc_sc; #define sramc_write_4(sc, reg, val) \ bus_space_write_4((sc)->bst, (sc)->bsh, (reg), (val)) - static int a10_sramc_probe(device_t dev) { Modified: head/sys/arm/allwinner/a20/a20_cpu_cfg.c ============================================================================== --- head/sys/arm/allwinner/a20/a20_cpu_cfg.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a20/a20_cpu_cfg.c Tue Sep 1 21:17:24 2020 (r365068) @@ -136,4 +136,3 @@ a20_read_counter64(void) return (((uint64_t)hi << 32) | lo); } - Modified: head/sys/arm/allwinner/aw_dwc3.c ============================================================================== --- head/sys/arm/allwinner/aw_dwc3.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_dwc3.c Tue Sep 1 21:17:24 2020 (r365068) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include Modified: head/sys/arm/allwinner/aw_machdep.c ============================================================================== --- head/sys/arm/allwinner/aw_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -291,8 +291,6 @@ static platform_method_t h3_methods[] = { FDT_PLATFORM_DEF(h3, "h3", 0, "allwinner,sun8i-h3", 200); #endif - - u_int allwinner_soc_type(void) { Modified: head/sys/arm/allwinner/aw_mmc.c ============================================================================== --- head/sys/arm/allwinner/aw_mmc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_mmc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -951,7 +951,6 @@ aw_mmc_req_ok(struct aw_mmc_softc *sc) aw_mmc_req_done(sc); } - static inline void set_mmc_error(struct aw_mmc_softc *sc, int error_code) { @@ -1499,7 +1498,6 @@ aw_mmc_update_ios(device_t bus, device_t child) if (error != 0) return (error); } - return (0); } Modified: head/sys/arm/allwinner/aw_rtc.c ============================================================================== --- head/sys/arm/allwinner/aw_rtc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_rtc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -235,7 +235,7 @@ aw_rtc_attach(device_t dev) aw_rtc_install_clocks(sc, dev); clock_register(dev, RTC_RES_US); - + return (0); } @@ -290,7 +290,7 @@ aw_rtc_gettime(device_t dev, struct timespec *ts) rdate = RTC_READ(sc, sc->conf->rtc_date); rtime = RTC_READ(sc, sc->conf->rtc_time); - + if ((rtime & TIME_MASK) == 0) rdate = RTC_READ(sc, sc->conf->rtc_date); @@ -303,7 +303,7 @@ aw_rtc_gettime(device_t dev, struct timespec *ts) ct.dow = -1; /* RTC resolution is 1 sec */ ct.nsec = 0; - + return (clock_ct_to_ts(&ct, ts)); } @@ -320,7 +320,7 @@ aw_rtc_settime(device_t dev, struct timespec *ts) ts->tv_nsec = 0; clock_ts_to_ct(ts, &ct); - + if ((ct.year < YEAR_MIN) || (ct.year > YEAR_MAX)) { device_printf(dev, "could not set time, year out of range\n"); return (EINVAL); Modified: head/sys/arm/allwinner/aw_usbphy.c ============================================================================== --- head/sys/arm/allwinner/aw_usbphy.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_usbphy.c Tue Sep 1 21:17:24 2020 (r365068) @@ -432,7 +432,6 @@ awusbphy_set_mode(struct phynode *phynode, int mode) sc->mode = mode; - out: return (0); } Modified: head/sys/arm/allwinner/aw_wdog.c ============================================================================== --- head/sys/arm/allwinner/aw_wdog.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_wdog.c Tue Sep 1 21:17:24 2020 (r365068) @@ -176,7 +176,7 @@ aw_wdog_attach(device_t dev) EVENTHANDLER_REGISTER(watchdog_list, aw_wdog_watchdog_fn, sc, 0); EVENTHANDLER_REGISTER(shutdown_final, aw_wdog_shutdown_fn, sc, SHUTDOWN_PRI_LAST - 1); - + return (0); } Modified: head/sys/arm/allwinner/aw_wdog.h ============================================================================== --- head/sys/arm/allwinner/aw_wdog.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_wdog.h Tue Sep 1 21:17:24 2020 (r365068) @@ -32,4 +32,3 @@ void aw_wdog_watchdog_reset(void); #endif /*__AW_WDOG_H__*/ - Modified: head/sys/arm/allwinner/axp209.c ============================================================================== --- head/sys/arm/allwinner/axp209.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/axp209.c Tue Sep 1 21:17:24 2020 (r365068) @@ -1075,7 +1075,6 @@ axp2xx_gpio_pin_set(device_t dev, uint32_t pin, unsign return (error); } - static int axp2xx_gpio_pin_toggle(device_t dev, uint32_t pin) { Modified: head/sys/arm/allwinner/axp209reg.h ============================================================================== --- head/sys/arm/allwinner/axp209reg.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/axp209reg.h Tue Sep 1 21:17:24 2020 (r365068) @@ -204,7 +204,6 @@ #define AXP221_REG_ALDO2_VOLTAGE 0x29 #define AXP221_REG_ALDO3_VOLTAGE 0x2A - enum axp2xx_sensor { AXP209_ACVOLT, AXP209_ACCURRENT, Modified: head/sys/arm/allwinner/axp81x.c ============================================================================== --- head/sys/arm/allwinner/axp81x.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/axp81x.c Tue Sep 1 21:17:24 2020 (r365068) @@ -1317,7 +1317,6 @@ axp8xx_gpio_pin_set(device_t dev, uint32_t pin, unsign return (error); } - static int axp8xx_gpio_pin_toggle(device_t dev, uint32_t pin) { Modified: head/sys/arm/allwinner/clkng/ccu_a10.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a10.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a10.c Tue Sep 1 21:17:24 2020 (r365068) @@ -300,7 +300,6 @@ NM_CLK(apb1_clk, 0, /* gate */ AW_CLK_HAS_MUX); /* flags */ - NKMP_CLK(pll_ddr_other_clk, CLK_PLL_DDR_OTHER, /* id */ "pll_ddr_other", pll_parents, /* name, parents */ Modified: head/sys/arm/allwinner/clkng/ccu_a13.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a13.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a13.c Tue Sep 1 21:17:24 2020 (r365068) @@ -498,7 +498,6 @@ static struct aw_clk_nm_def ir_clk = { /* Missing CSI clock */ /* Missing VE clock */ - /* Clocks list */ static struct aw_ccung_clk a13_ccu_clks[] = { { .type = AW_CLK_NKMP, .clk.nkmp = &pll_core}, Modified: head/sys/arm/allwinner/clkng/ccu_a31.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a31.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a31.c Tue Sep 1 21:17:24 2020 (r365068) @@ -608,7 +608,6 @@ NM_CLK(spi3_clk, 31, /* gate */ AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ - static const char *daudio_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"}; MUX_CLK(daudio0mux_clk, 0, Modified: head/sys/arm/allwinner/clkng/ccu_a83t.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a83t.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a83t.c Tue Sep 1 21:17:24 2020 (r365068) @@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$"); /* Non-exported fixed clocks */ #define CLK_OSC_12M 150 - static struct aw_ccung_reset a83t_ccu_resets[] = { CCU_RESET(RST_USB_PHY0, 0xcc, 0) CCU_RESET(RST_USB_PHY1, 0xcc, 1) Modified: head/sys/arm/allwinner/if_emac.c ============================================================================== --- head/sys/arm/allwinner/if_emac.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/if_emac.c Tue Sep 1 21:17:24 2020 (r365068) @@ -467,7 +467,7 @@ emac_watchdog(struct emac_softc *sc) "(missed link)\n"); } else if_printf(sc->emac_ifp, "watchdog timeout -- resetting\n"); - + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; emac_init_locked(sc); @@ -601,7 +601,6 @@ emac_init_locked(struct emac_softc *sc) callout_reset(&sc->emac_tick_ch, hz, emac_tick, sc); } - static void emac_start(struct ifnet *ifp) Modified: head/sys/arm/altera/socfpga/socfpga_a10_manager.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_a10_manager.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/altera/socfpga/socfpga_a10_manager.c Tue Sep 1 21:17:24 2020 (r365068) @@ -141,7 +141,6 @@ fpga_wait_dclk_pulses(struct fpgamgr_a10_softc *sc, in return (0); } - static int fpga_open(struct cdev *dev, int flags __unused, int fmt __unused, struct thread *td __unused) Modified: head/sys/arm/altera/socfpga/socfpga_common.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_common.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/altera/socfpga/socfpga_common.c Tue Sep 1 21:17:24 2020 (r365068) @@ -42,4 +42,3 @@ __FBSDID("$FreeBSD$"); #include #include - Modified: head/sys/arm/amlogic/aml8726/aml8726_ccm.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_ccm.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_ccm.c Tue Sep 1 21:17:24 2020 (r365068) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - struct aml8726_ccm_softc { device_t dev; struct aml8726_ccm_function *soc; Modified: head/sys/arm/amlogic/aml8726/aml8726_ccm.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_ccm.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_ccm.h Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #ifndef _ARM_AMLOGIC_AML8726_CCM_H #define _ARM_AMLOGIC_AML8726_CCM_H - struct aml8726_ccm_gate { uint32_t addr; uint32_t bits; @@ -40,7 +39,6 @@ struct aml8726_ccm_function { struct aml8726_ccm_gate *gates; }; - /* * aml8726-m3 */ @@ -109,7 +107,6 @@ struct aml8726_ccm_function aml8726_m3_ccm[] = { { NULL } }; - /* * aml8726-m6 */ @@ -178,7 +175,6 @@ struct aml8726_ccm_function aml8726_m6_ccm[] = { { NULL } }; - /* * aml8726-m8 */ @@ -249,7 +245,6 @@ struct aml8726_ccm_function aml8726_m8_ccm[] = { { "usb-b", aml8726_m8_usb_b }, { NULL } }; - /* * aml8726-m8b Modified: head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c Tue Sep 1 21:17:24 2020 (r365068) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct aml8726_clkmsr_clk { const char * name; uint32_t mux; @@ -216,7 +215,6 @@ aml8726_clkmsr_detach(device_t dev) return (0); } - static device_method_t aml8726_clkmsr_methods[] = { /* Device interface */ Modified: head/sys/arm/amlogic/aml8726/aml8726_fb.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_fb.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_fb.c Tue Sep 1 21:17:24 2020 (r365068) @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include "fb_if.h" - enum aml8726_fb_output { aml8726_unknown_fb_output, aml8726_cvbs_fb_output, Modified: head/sys/arm/amlogic/aml8726/aml8726_fb.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_fb.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_fb.h Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #ifndef _ARM_AMLOGIC_AML8726_FB_H #define _ARM_AMLOGIC_AML8726_FB_H - #define AML_CAV_OSD1_INDEX 0x40 #define AML_CAV_LUT_DATAL_REG 0 Modified: head/sys/arm/amlogic/aml8726/aml8726_gpio.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_gpio.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_gpio.c Tue Sep 1 21:17:24 2020 (r365068) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include "gpio_if.h" - struct aml8726_gpio_softc { device_t dev; struct resource *res[3]; Modified: head/sys/arm/amlogic/aml8726/aml8726_i2c.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_i2c.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_i2c.c Tue Sep 1 21:17:24 2020 (r365068) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include "iicbb_if.h" - struct aml8726_iic_softc { device_t dev; struct resource *res[1]; Modified: head/sys/arm/amlogic/aml8726/aml8726_mmc.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_mmc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_mmc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -485,7 +485,6 @@ spurious: CSR_WRITE_4(sc, AML_MMC_MULT_CONFIG_REG, mcfgr); if ((cmdr & AML_MMC_CMD_RESP_CRC7_FROM_8) != 0) { - /* * Controller supplies 135:8 instead of * 127:0 so discard the leading 8 bits Modified: head/sys/arm/amlogic/aml8726/aml8726_mmc.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_mmc.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_mmc.h Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #ifndef _ARM_AMLOGIC_AML8726_MMC_H #define _ARM_AMLOGIC_AML8726_MMC_H - #define AML_MMC_ALIGN_DMA 4 #define AML_MMC_MAX_DMA 4096 Modified: head/sys/arm/amlogic/aml8726/aml8726_mp.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_mp.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_mp.c Tue Sep 1 21:17:24 2020 (r365068) @@ -198,7 +198,6 @@ find_node_for_device(const char *device, const char ** return (0); } - static int alloc_resource_for_node(phandle_t node, struct resource *res, u_long *size) { @@ -221,7 +220,6 @@ alloc_resource_for_node(phandle_t node, struct resourc return (err); } - static void power_on_cpu(int cpu) { @@ -374,7 +372,6 @@ platform_mp_setmaxid(void) if (alloc_resource_for_node(cpucfg_node, &aml8726_smp.cpucfg_res, &aml8726_smp.cpucfg_size) != 0) panic("Could not allocate resource for CPUCONFIG"); - /* * Strictly speaking the aobus and cbus may not be required in Modified: head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c Tue Sep 1 21:17:24 2020 (r365068) @@ -172,7 +172,6 @@ aml8726_pinctrl_detach(device_t dev) return (0); } - static int aml8726_pinctrl_configure_pins(device_t dev, phandle_t cfgxref) { @@ -406,7 +405,6 @@ aml8726_pinctrl_configure_pins(device_t dev, phandle_t return (0); } - static device_method_t aml8726_pinctrl_methods[] = { /* Device interface */ Modified: head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h Tue Sep 1 21:17:24 2020 (r365068) @@ -525,7 +525,6 @@ struct aml8726_pinctrl_function aml8726_m6_pinctrl[] = { NULL } }; - /* * aml8726-m8 * @@ -796,7 +795,6 @@ struct aml8726_pinctrl_function aml8726_m8_pinctrl[] = { "uart-ao", aml8726_m8_uart_ao }, { NULL } }; - /* * aml8726-m8b Modified: head/sys/arm/amlogic/aml8726/aml8726_rng.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_rng.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_rng.c Tue Sep 1 21:17:24 2020 (r365068) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include - struct aml8726_rng_softc { device_t dev; struct resource *res[1]; Modified: head/sys/arm/amlogic/aml8726/aml8726_rtc.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_rtc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_rtc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -290,7 +290,6 @@ aml8726_rtc_initialize(struct aml8726_rtc_softc *sc) if (sc->init.always == TRUE || (CSR_READ_4(sc, AML_RTC_1_REG) & AML_RTC_SRDY) == 0) { - /* * The RTC has a 16 bit initialization register. The upper * bits can be written directly. The lower bits are written Modified: head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c Tue Sep 1 21:17:24 2020 (r365068) @@ -480,7 +480,6 @@ aml8726_sdxc_finish_command(struct aml8726_sdxc_softc stop_cmd = (cmd->mrq->stop != cmd) ? cmd->mrq->stop : NULL; if (stop_cmd != NULL) { - /* * If the original command executed successfully, then * the hardware will also have automatically executed Modified: head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c Tue Sep 1 21:17:24 2020 (r365068) @@ -116,7 +116,7 @@ aml8726_usb_phy_mode(const char *dwcotg_path, uint32_t char *usb_mode; phandle_t node; ssize_t len; - + if ((node = OF_finddevice(dwcotg_path)) == -1) return (ENXIO); Modified: head/sys/arm/amlogic/aml8726/aml8726_wdt.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_wdt.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_wdt.c Tue Sep 1 21:17:24 2020 (r365068) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include - struct aml8726_wdt_softc { device_t dev; struct resource * res[2]; @@ -115,7 +114,6 @@ aml8726_wdt_watchdog(void *private, u_int cmd, int *er if (cmd != 0 && tens_of_usec <= (AML_WDT_CTRL_TERMINAL_CNT_MASK >> AML_WDT_CTRL_TERMINAL_CNT_SHIFT)) { - wcr = AML_WDT_CTRL_CPU_WDRESET_MASK | AML_WDT_CTRL_EN | ((uint32_t)tens_of_usec << AML_WDT_CTRL_TERMINAL_CNT_SHIFT); Modified: head/sys/arm/annapurna/alpine/alpine_ccu.c ============================================================================== --- head/sys/arm/annapurna/alpine/alpine_ccu.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/annapurna/alpine/alpine_ccu.c Tue Sep 1 21:17:24 2020 (r365068) @@ -62,7 +62,6 @@ static device_method_t al_ccu_methods[] = { DEVMETHOD(device_probe, al_ccu_probe), DEVMETHOD(device_attach, al_ccu_attach), DEVMETHOD(device_detach, al_ccu_detach), - { 0, 0 } }; Modified: head/sys/arm/annapurna/alpine/alpine_nb_service.c ============================================================================== --- head/sys/arm/annapurna/alpine/alpine_nb_service.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/annapurna/alpine/alpine_nb_service.c Tue Sep 1 21:17:24 2020 (r365068) @@ -61,7 +61,6 @@ static device_method_t nb_service_methods[] = { DEVMETHOD(device_probe, nb_service_probe), DEVMETHOD(device_attach, nb_service_attach), DEVMETHOD(device_detach, nb_service_detach), - { 0, 0 } }; Modified: head/sys/arm/arm/autoconf.c ============================================================================== --- head/sys/arm/arm/autoconf.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/autoconf.c Tue Sep 1 21:17:24 2020 (r365068) @@ -74,7 +74,6 @@ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, co device_t nexus_dev; - /* * Determine i/o configuration for a machine. */ Modified: head/sys/arm/arm/bus_space_generic.c ============================================================================== --- head/sys/arm/arm/bus_space_generic.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/bus_space_generic.c Tue Sep 1 21:17:24 2020 (r365068) @@ -91,7 +91,6 @@ generic_bs_alloc(bus_space_tag_t t, bus_addr_t rstart, panic("generic_bs_alloc(): not implemented"); } - void generic_bs_unmap(bus_space_tag_t t, bus_space_handle_t h, bus_size_t size) { Modified: head/sys/arm/arm/busdma_machdep.c ============================================================================== --- head/sys/arm/arm/busdma_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/busdma_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -644,7 +644,6 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat) dmat_copy = dmat; if (dmat != NULL) { - if (dmat->map_count != 0) { error = EBUSY; goto out; @@ -997,7 +996,6 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, pmap_t pma map->pagesneeded++; } vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); - } CTR1(KTR_BUSDMA, "pagesneeded= %d", map->pagesneeded); } @@ -1237,7 +1235,6 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap if (map->sync_count == 0 || (kvaddr != 0 && kvaddr != sl_vend) || (curaddr != sl_pend)) { - if (++map->sync_count > dmat->nsegments) goto cleanup; sl++; @@ -1416,7 +1413,6 @@ bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, * we're able to test direct userland dma, panic on a map mismatch. */ if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x " "performing bounce", __func__, dmat, dmat->flags, op); Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/cpufunc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -196,7 +196,6 @@ struct cpu_functions sheeva_cpufuncs = { #ifdef CPU_MV_PJ4B struct cpu_functions pj4bv7_cpufuncs = { - /* Cache operations */ .cf_l2cache_wbinv_all = (void *)cpufunc_nullop, .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, @@ -214,7 +213,6 @@ struct cpu_functions pj4bv7_cpufuncs = { #if defined(CPU_ARM1176) struct cpu_functions arm1176_cpufuncs = { - /* Cache operations */ .cf_l2cache_wbinv_all = (void *)cpufunc_nullop, .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, @@ -232,7 +230,6 @@ struct cpu_functions arm1176_cpufuncs = { #if defined(CPU_CORTEXA) || defined(CPU_KRAIT) struct cpu_functions cortexa_cpufuncs = { - /* Cache operations */ /* Modified: head/sys/arm/arm/cpuinfo.c ============================================================================== --- head/sys/arm/arm/cpuinfo.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/cpuinfo.c Tue Sep 1 21:17:24 2020 (r365068) @@ -79,7 +79,6 @@ SYSCTL_INT(_hw_cpu_quirks, OID_AUTO, actlr_set, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &cpu_quirks_actlr_set, 0, "Bits to be set in ACTLR"); - /* Read and parse CPU id scheme */ void cpuinfo_init(void) Modified: head/sys/arm/arm/db_interface.c ============================================================================== --- head/sys/arm/arm/db_interface.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/db_interface.c Tue Sep 1 21:17:24 2020 (r365068) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int nil = 0; int db_access_und_sp (struct db_variable *, db_expr_t *, int); @@ -252,7 +251,6 @@ db_write_bytes(vm_offset_t addr, size_t size, char *da tlb_flush_all(); return (0); } - static u_int db_fetch_reg(int reg) Modified: head/sys/arm/arm/db_trace.c ============================================================================== --- head/sys/arm/arm/db_trace.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/db_trace.c Tue Sep 1 21:17:24 2020 (r365068) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include #include @@ -102,7 +101,6 @@ db_stack_trace_cmd(struct unwind_state *state) i = 0; } else sep = " "; - } } db_printf("\n"); Modified: head/sys/arm/arm/disassem.c ============================================================================== --- head/sys/arm/arm/disassem.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/disassem.c Tue Sep 1 21:17:24 2020 (r365068) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include - #include #include #include @@ -532,7 +531,6 @@ disasm(const disasm_interface_t *di, vm_offset_t loc, return(loc + INSN_SIZE); } - static void disasm_register_shift(const disasm_interface_t *di, u_int insn) { @@ -550,7 +548,6 @@ disasm_register_shift(const disasm_interface_t *di, u_ (insn >> 7) & 0x1f); } } - static void disasm_print_reglist(const disasm_interface_t *di, u_int insn) Modified: head/sys/arm/arm/elf_machdep.c ============================================================================== --- head/sys/arm/arm/elf_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/elf_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -190,7 +190,6 @@ store_ptr(Elf_Addr *where, Elf_Addr val) } #undef RELOC_ALIGNED_P - /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, @@ -233,7 +232,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas } switch (rtype) { - case R_ARM_NONE: /* none */ break; Modified: head/sys/arm/arm/gdb_machdep.c ============================================================================== --- head/sys/arm/arm/gdb_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/gdb_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include Modified: head/sys/arm/arm/generic_timer.c ============================================================================== --- head/sys/arm/arm/generic_timer.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/generic_timer.c Tue Sep 1 21:17:24 2020 (r365068) @@ -383,7 +383,6 @@ arm_tmr_acpi_probe(device_t dev) } #endif - static int arm_tmr_attach(device_t dev) { Modified: head/sys/arm/arm/gic.c ============================================================================== --- head/sys/arm/arm/gic.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/gic.c Tue Sep 1 21:17:24 2020 (r365068) @@ -98,7 +98,6 @@ __FBSDID("$FreeBSD$"); #define GIC_SUPPORT_SECEXT(_sc) \ ((_sc->typer & GICD_TYPER_SECURITYEXT) == GICD_TYPER_SECURITYEXT) - #ifndef GIC_DEFAULT_ICFGR_INIT #define GIC_DEFAULT_ICFGR_INIT 0x00000000 #endif @@ -133,7 +132,6 @@ static struct resource_spec arm_gic_spec[] = { { -1, 0 } }; - #if defined(__arm__) && defined(INVARIANTS) static int gic_debug_spurious = 1; #else @@ -1137,7 +1135,6 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int for (i = 0; i < count; i++) { /* Mark the interrupt as used */ psc->gic_irqs[irq + i].gi_flags |= GI_FLAG_MSI_USED; - } mtx_unlock(&sc->sc_mutex); Modified: head/sys/arm/arm/identcpu-v4.c ============================================================================== --- head/sys/arm/arm/identcpu-v4.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/identcpu-v4.c Tue Sep 1 21:17:24 2020 (r365068) @@ -198,7 +198,6 @@ const struct cpuidtab cpuids[] = { { CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD", generic_steppings }, - { 0, CPU_CLASS_NONE, NULL, NULL } }; Modified: head/sys/arm/arm/identcpu-v6.c ============================================================================== --- head/sys/arm/arm/identcpu-v6.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/identcpu-v6.c Tue Sep 1 21:17:24 2020 (r365068) @@ -107,7 +107,6 @@ static struct { CPU_CLASS_KRAIT}, }; - static void print_v5_cache(void) { @@ -168,7 +167,6 @@ print_v5_cache(void) } pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8); - /* Print cache info. */ if (picache_line_size == 0 && pdcache_line_size == 0) return; @@ -272,7 +270,6 @@ add_cap(char *cap) hw_buf_idx += sprintf(hw_buf + hw_buf_idx, ", "); hw_buf_newline = false; - hw_buf_idx += sprintf(hw_buf + hw_buf_idx, "%s", cap); } @@ -298,7 +295,6 @@ identify_arm_cpu(void) printf("CPU: %s\n", cpu_model); break; } - } if (i >= nitems(cpu_names)) printf("unknown CPU (ID = 0x%x)\n", cpuinfo.midr); Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -427,7 +427,6 @@ exec_setregs(struct thread *td, struct image_params *i tf->tf_spsr = PSR_USR32_MODE; } - #ifdef VFP /* * Get machine VFP context. @@ -928,7 +927,6 @@ initarm(struct arm_boot_params *abp) kernel_pt_table[i].pv_pa = kernel_pt_table[i].pv_va - KERNVIRTADDR + abp->abp_physaddr; - } } /* Modified: head/sys/arm/arm/machdep_boot.c ============================================================================== --- head/sys/arm/arm/machdep_boot.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/machdep_boot.c Tue Sep 1 21:17:24 2020 (r365068) @@ -144,7 +144,6 @@ arm_print_kenv(void) debugf(" %x %s\n", (uint32_t)cp, cp); } - #if defined(LINUX_BOOT_ABI) /* Convert the U-Boot command line into FreeBSD kenv and boot options. */ @@ -343,7 +342,6 @@ default_parse_boot_param(struct arm_boot_params *abp) * own. We just fake metadata... */ __weak_reference(default_parse_boot_param, parse_boot_param); - /* * Fake up a boot descriptor table Modified: head/sys/arm/arm/machdep_ptrace.c ============================================================================== --- head/sys/arm/arm/machdep_ptrace.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/machdep_ptrace.c Tue Sep 1 21:17:24 2020 (r365068) @@ -238,7 +238,6 @@ arm_predict_branch(void *cookie, u_int insn, register_ offset = (insn & 0xff) << (32 - offset) | (insn & 0xff) >> offset; } else { - offset = fetch_reg(cookie, insn & 0x0f); if ((insn & 0x0000ff0) != 0x00000000) { if (insn & 0x10) @@ -258,11 +257,9 @@ arm_predict_branch(void *cookie, u_int insn, register_ default: break; /* XXX */ } - } *new_pc = addr + offset; return (0); - } case 0xa: /* b ... */ Modified: head/sys/arm/arm/mpcore_timer.c ============================================================================== --- head/sys/arm/arm/mpcore_timer.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/mpcore_timer.c Tue Sep 1 21:17:24 2020 (r365068) @@ -252,9 +252,6 @@ arm_tmr_intr(void *arg) return (FILTER_HANDLED); } - - - /** * arm_tmr_probe - timer probe routine * @dev: new device Modified: head/sys/arm/arm/nexus.c ============================================================================== --- head/sys/arm/arm/nexus.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/nexus.c Tue Sep 1 21:17:24 2020 (r365068) @@ -219,7 +219,6 @@ nexus_add_child(device_t bus, u_int order, const char return (child); } - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -470,4 +469,3 @@ nexus_ofw_map_intr(device_t dev, device_t child, phand #endif /* INTRNG */ } #endif /* FDT */ - Modified: head/sys/arm/arm/nexusvar.h ============================================================================== --- head/sys/arm/arm/nexusvar.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/nexusvar.h Tue Sep 1 21:17:24 2020 (r365068) @@ -33,4 +33,3 @@ void nexus_set_dma_tag(bus_dma_tag_t _tag); #endif - Modified: head/sys/arm/arm/ofw_machdep.c ============================================================================== --- head/sys/arm/arm/ofw_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/ofw_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -72,4 +72,3 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag return (bus_space_map(*tag, addr, size, flags, handle)); } - Modified: head/sys/arm/arm/pl310.c ============================================================================== --- head/sys/arm/arm/pl310.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/pl310.c Tue Sep 1 21:17:24 2020 (r365068) @@ -219,7 +219,6 @@ pl310_wait_background_op(uint32_t off, uint32_t mask) continue; } - /** * pl310_cache_sync - performs a cache sync operation * @@ -251,7 +250,6 @@ pl310_cache_sync(void) pl310_write4(pl310_softc, PL310_CACHE_SYNC, 0xffffffff); } - static void pl310_wbinv_all(void) { @@ -274,7 +272,6 @@ pl310_wbinv_all(void) pl310_cache_sync(); PL310_UNLOCK(pl310_softc); return; - } if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) platform_pl310_write_debug(pl310_softc, 3); @@ -306,7 +303,6 @@ pl310_wbinv_range(vm_paddr_t start, vm_size_t size) size += g_l2cache_line_size; } - #ifdef PL310_ERRATA_727915 if (pl310_softc->sc_rtl_revision >= CACHE_ID_RELEASE_r2p0 && pl310_softc->sc_rtl_revision < CACHE_ID_RELEASE_r3p1) @@ -595,4 +591,3 @@ static devclass_t pl310_devclass; EARLY_DRIVER_MODULE(pl310, simplebus, pl310_driver, pl310_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE); - Modified: head/sys/arm/arm/pmap-v4.c ============================================================================== --- head/sys/arm/arm/pmap-v4.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/pmap-v4.c Tue Sep 1 21:17:24 2020 (r365068) @@ -712,7 +712,6 @@ pmap_free_l2_bucket(pmap_t pm, struct l2_bucket *l2b, pt_entry_t *ptep; u_short l1idx; - /* * Update the bucket's reference count according to how many * PTEs the caller has just invalidated. @@ -1057,9 +1056,7 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse /* check for user uncachable conditions - order is important */ if (pm != kernel_pmap && (pv->pv_pmap == pm || pv->pv_pmap == kernel_pmap)) { - if ((uentries > 1 && uwritable) || uwritable > 1) { - /* user duplicate mapping */ if (pv->pv_pmap != kernel_pmap) pv->pv_flags |= PVF_MWC; @@ -1083,7 +1080,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse (pv->pv_pmap == kernel_pmap || (pv->pv_flags & PVF_WRITE) || (pv->pv_flags & PVF_MWC)))) { - if (!(pv->pv_flags & PVF_NC)) { pv->pv_flags |= PVF_NC; pmap_set_cache_entry(pv, pm, va, -1); @@ -1094,7 +1090,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse /* kernel and user are cachable */ if ((pm == kernel_pmap) && !(pv->pv_flags & PVF_MWC) && (pv->pv_flags & PVF_NC)) { - pv->pv_flags &= ~PVF_NC; if (pg->md.pv_memattr != VM_MEMATTR_UNCACHEABLE) pmap_set_cache_entry(pv, pm, va, 1); @@ -1104,7 +1099,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse if (pm != kernel_pmap && *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***