Sun Jul 19 08:58:35 2020 UTC ()

KNF whitespace nits.


(simonb)

diff -r1.14 -r1.15 src/sys/arch/mips/cavium/octeon_cpunode.c

--- src/sys/arch/mips/cavium/octeon_cpunode.c 2020/07/17 21:59:30	1.14
+++ src/sys/arch/mips/cavium/octeon_cpunode.c 2020/07/19 08:58:35	1.15

 @@ -19,27 +19,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define __INTR_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.14 2020/07/17 21:59:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.15 2020/07/19 08:58:35 simonb Exp $");
 #include "locators.h"
 #include "cpunode.h"
 #include "opt_multiprocessor.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/cpu.h>
 #include <sys/atomic.h>
 #include <sys/wdog.h>
 @@ -90,27 +90,27 @@ cpunode_mainbus_print(void *aux, const c
 	if (pnp)
 		aprint_normal("%s", pnp);
 	if (cnaa->cnaa_cpunum != CPUNODECF_CORE_DEFAULT)
 		aprint_normal(" core %d", cnaa->cnaa_cpunum);
 	return UNCONF;
+}
 int
 cpunode_mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 void
 cpunode_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpunode_softc * const sc = device_private(self);
 	const uint64_t fuse = octeon_xkphys_read_8(CIU_FUSE);
 	int cpunum = 0;
 	sc->sc_dev = self;
 	aprint_naive(": %u core%s\n", popcount64(fuse), fuse == 1 ? "" : "s");
 @@ -213,26 +213,27 @@ octeon_cpu_init(struct cpu_info *ci)
 	KASSERT(ok);
 	(void) splhigh();		// make sure interrupts are masked
 	KASSERT((mipsNN_cp0_ebase_read() & MIPS_EBASE_CPUNUM) == ci->ci_cpuid);
 	KASSERT(curcpu() == ci);
 	KASSERT(ci->ci_cpl == IPL_HIGH);
 	KASSERT((mips_cp0_status_read() & MIPS_INT_MASK) == 0);
+}
 static void
 octeon_cpu_run(struct cpu_info *ci)
+{
 	octeon_intr_init(ci);
 	mips3_initclocks();
 	KASSERTMSG(ci->ci_cpl == IPL_NONE, "cpl %d", ci->ci_cpl);
 	KASSERT(mips_cp0_status_read() & MIPS_SR_INT_IE);
 	aprint_normal("%s: ", device_xname(ci->ci_dev));
 	cpu_identify(ci->ci_dev);
+}
 #endif /* MULTIPROCESSOR */
 static void
 cpu_cpunode_attach_common(device_t self, struct cpu_info *ci)
 @@ -392,32 +393,34 @@ wdog_cpunode_setmode(struct sysmon_wdog
 			    cpu_name(ci), wdog, wdog_len);
 			mips3_sd(cpu->cpu_wdog, wdog);
+		}
 		sc->sc_wdog_armed = true;
 		kpreempt_enable();
+	}
 	return 0;
+}
 static void
 wdog_cpunode_poke(void *arg)
+{
 	struct cpu_softc *cpu = arg;
 	mips3_sd(cpu->cpu_pp_poke, 0);
+}
 static int
 wdog_cpunode_tickle(struct sysmon_wdog *smw)
+{
 	wdog_cpunode_poke(curcpu()->ci_softc);
 #ifdef MULTIPROCESSOR
 	// We need to send IPIs to the other CPUs to poke their wdog.
 	cpu_send_ipi(NULL, IPI_WDOG);
 #endif
 	return 0;
+}
 int
 wdog_cpunode_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct cpunode_softc * const sc = device_private(parent);
 	struct cpunode_attach_args * const cnaa = aux;