 @@ -1,14 +1,14 @@
-/*	$NetBSD: awacs.c,v 1.48 2019/06/08 08:02:37 isaki Exp $	*/
+/*	$NetBSD: awacs.c,v 1.49 2021/01/26 14:49:41 thorpej Exp $	*/
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.48 2019/06/08 08:02:37 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.49 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/audioio.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/kthread.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <dev/audio/audio_if.h>
 #include <uvm/uvm_extern.h>
 @@ -363,36 +363,35 @@ awacs_attach(device_t parent, device_t s
 		cirq_type = oirq_type = iirq_type = IST_EDGE;
+	}
 	intr_establish(cirq, cirq_type, IPL_BIO, awacs_status_intr, sc);
 	intr_establish(oirq, oirq_type, IPL_AUDIO, awacs_intr, sc);
 	intr_establish(iirq, iirq_type, IPL_AUDIO, awacs_intr, sc);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	cv_init(&sc->sc_event, "awacs_wait");
 	/* check if the chip is a screamer */
-	sc->sc_screamer = (of_compatible(ca->ca_node, screamer) != -1);
+	sc->sc_screamer = of_compatible(ca->ca_node, screamer);
 	if (!sc->sc_screamer) {
 		/* look for 'sound' child node */
 		int sound_node;
 		sound_node = OF_child(ca->ca_node);
 		while ((sound_node != 0) && (!sc->sc_screamer)) {
-			sc->sc_screamer =
+			sc->sc_screamer = of_compatible(sound_node, screamer);
 			    (of_compatible(sound_node, screamer) != -1);
 			sound_node = OF_peer(sound_node);
+		}
+	}
 	if (sc->sc_screamer) {
 		printf(" Screamer");
+	}
 	printf(": irq %d,%d,%d\n", cirq, oirq, iirq);
 	sc->vol_l = 0;
 	sc->vol_r = 0;
 @@ -416,51 +415,50 @@ awacs_attach(device_t parent, device_t s
         printf("%s: ", device_xname(sc->sc_dev));
 	/*
 	 * all(?) awacs have GPIOs to detect if there's something plugged into
 	 * the headphone jack. The other GPIOs are either used for other jacks
 	 * ( the PB3400c's microphone jack for instance ) or unused.
 	 * The problem is that there are at least three different ways how
 	 * those GPIOs are wired to the actual jacks.
 	 * For now we bother only with headphone detection
 	 */
 	perch = OF_finddevice("/perch");
 	root_node = OF_finddevice("/");
-	if (of_compatible(root_node, detect_reversed) != -1) {
+	if (of_compatible(root_node, detect_reversed)) {
 		/* 0x02 is for the microphone jack, high active */
 		/*
 		 * for some reason the gpio for the headphones jack is low
 		 * active on the PB3400 and similar machines
 		 */
 		sc->sc_headphones_mask = 0x8;
 		sc->sc_headphones_in = 0x0;
-	} else if ((perch != -1) ||
+	} else if ((perch != -1) || of_compatible(root_node, use_gpio4)) {
 	    (of_compatible(root_node, use_gpio4) != -1)) {
 		/*
 		 * this is for the beige G3's 'personality card' which uses
 		 * yet another wiring of the headphone detect GPIOs
 		 * some G4s use it as well
 		 */
 		sc->sc_headphones_mask = 0x04;
 		sc->sc_headphones_in = 0x04;
 	} else {
 		/* while on most machines it's high active as well */
 		sc->sc_headphones_mask = 0x8;
 		sc->sc_headphones_in = 0x8;
+	}
-	if (of_compatible(root_node, no_parallel_output) != -1)
+	if (of_compatible(root_node, no_parallel_output))
 		sc->sc_need_parallel_output = 0;
 	else {
 		sc->sc_need_parallel_output = 1;
 		sc->sc_codecctl1 |= AWACS_PARALLEL_OUTPUT;
+	}
 	if (awacs_check_headphones(sc)) {
                 /* default output to headphones */
                 printf("headphones\n");
                 sc->sc_output_mask = OUTPUT_HEADPHONES;
         } else {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mediabay.c,v 1.22 2011/07/26 08:36:02 macallan Exp $	*/
+/*	$NetBSD: mediabay.c,v 1.23 2021/01/26 14:49:41 thorpej Exp $	*/
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.22 2011/07/26 08:36:02 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.23 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/systm.h>
 #include <dev/ofw/openfirm.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 enum mediabay_controller {
 @@ -122,27 +122,27 @@ mediabay_attach(device_t parent, device_
 	struct confargs *ca = aux;
 	int irq, itype;
 	sc->sc_dev = self;
 	ca->ca_reg[0] += ca->ca_baseaddr;
 	sc->sc_addr = mapiodev(ca->ca_reg[0], PAGE_SIZE, false);
 	sc->sc_node = ca->ca_node;
 	sc->sc_baseaddr = ca->ca_baseaddr;
 	sc->sc_tag = ca->ca_tag;
 	irq = ca->ca_intr[0];
 	itype = IST_EDGE;
-	if (of_compatible(ca->ca_node, mediabay_keylargo) != -1) {
+	if (of_compatible(ca->ca_node, mediabay_keylargo)) {
 		sc->sc_type = MB_CONTROLLER_KEYLARGO;
 		sc->sc_fcr = sc->sc_addr + 2;
 	} else {
 		sc->sc_type = MB_CONTROLLER_OTHER;
 		sc->sc_fcr = sc->sc_addr + 1;
+	}
 	if (ca->ca_nintr == 8 && ca->ca_intr[1] != 0)
 		itype = IST_LEVEL;
 	printf(" irq %d %s\n", irq, intr_typename(itype));
 	intr_establish(irq, itype, IPL_BIO, mediabay_intr, sc);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio.c,v 1.47 2020/10/25 16:39:00 nia Exp $	*/
+/*	$NetBSD: obio.c,v 1.48 2021/01/26 14:49:41 thorpej Exp $	*/
 /*-
  * Copyright (C) 1998	Internet Research Institute, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.47 2020/10/25 16:39:00 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.48 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ofw/openfirm.h>
 #include <machine/autoconf.h>
 @@ -358,27 +358,27 @@ obio_setup_cpufreq(device_t dev)
 	if (ret != 0)
 		aprint_error_dev(sc->sc_dev, "cpufreq_register() failed, error %d\n", ret);
+}
 static void
 obio_setup_gpios(struct obio_softc *sc, int node)
+{
 	uint32_t gpio_base, reg[6];
 	const struct sysctlnode *sysctl_node, *me, *freq;
 	struct cpufreq *cf = &sc->sc_cf;
 	char name[32];
 	int child, use_dfs, cpunode, hiclock;
-	if (of_compatible(sc->sc_node, keylargo) == -1)
+	if (! of_compatible(sc->sc_node, keylargo))
 		return;
 	if (OF_getprop(node, "reg", reg, sizeof(reg)) < 4)
 		return;
 	gpio_base = reg[0];
 	DPRINTF("gpio_base: %02x\n", gpio_base);
 	/* now look for voltage and bus speed gpios */
 	use_dfs = 0;
 	for (child = OF_child(node); child; child = OF_peer(child)) {
 		if (OF_getprop(child, "name", name, sizeof(name)) < 1)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmu.c,v 1.34 2020/07/14 08:58:03 martin Exp $ */
+/*	$NetBSD: pmu.c,v 1.35 2021/01/26 14:49:41 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.34 2020/07/14 08:58:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.35 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/atomic.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/autoconf.h>
 @@ -418,30 +418,30 @@ next:
 	if (OF_finddevice("/bandit/ohare") != -1) {
 		aprint_normal_dev(self, "enabling ohare backlight control\n");
 		sc->sc_flags |= PMU_HAS_BACKLIGHT_CONTROL;
 		cmd[0] = 0;
 		cmd[1] = 0;
 		memset(resp, 0, 6);
 		if (pmu_send(sc, PMU_READ_BRIGHTNESS, 1, cmd, 16, resp) > 1) {
 			sc->sc_brightness_wanted = resp[1];
 			pmu_update_brightness(sc);
+		}
+	}
 	/* attach batteries */
-	if (of_compatible(root_node, has_legacy_battery) != -1) {
+	if (of_compatible(root_node, has_legacy_battery)) {
 		pmu_attach_legacy_battery(sc);
-	} else if (of_compatible(root_node, has_two_smart_batteries) != -1) {
+	} else if (of_compatible(root_node, has_two_smart_batteries)) {
 		pmu_attach_smart_battery(sc, 0);
 		pmu_attach_smart_battery(sc, 1);
 	} else {
 		/* check how many batteries we have */
 		pmnode = of_getnode_byname(ca->ca_node, "power-mgt");
 		if (pmnode == -1)
 			goto bat_done;
 		if (OF_getprop(pmnode, "prim-info", regs, sizeof(regs)) < 24)
 			goto bat_done;
 		nbat = regs[6] >> 16;
 		for (i = 0; i < nbat; i++)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wdc_obio.c,v 1.61 2017/10/20 07:06:07 jdolecek Exp $	*/
+/*	$NetBSD: wdc_obio.c,v 1.62 2021/01/26 14:49:41 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Onno van der Linden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.61 2017/10/20 07:06:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.62 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 #include <dev/ata/atareg.h>
 @@ -97,27 +97,27 @@ static const char * const ata_names[] =
 int
 wdc_obio_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct confargs *ca = aux;
 	/* XXX should not use name */
 	if (strcmp(ca->ca_name, "ATA") == 0 ||
 	    strcmp(ca->ca_name, "ata") == 0 ||
 	    strcmp(ca->ca_name, "ata0") == 0 ||
 	    strcmp(ca->ca_name, "ide") == 0)
 		return 1;
-	if (of_compatible(ca->ca_node, ata_names) >= 0)
+	if (of_compatible(ca->ca_node, ata_names))
 		return 1;
 	return 0;
+}
 void
 wdc_obio_attach(device_t parent, device_t self, void *aux)
+{
 	struct wdc_obio_softc *sc = device_private(self);
 	struct wdc_regs *wdr;
 	struct confargs *ca = aux;
 	struct ata_channel *chp = &sc->sc_channel;
 	int intr, i, type = IST_EDGE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: interrupts.c,v 1.7 2018/05/11 22:48:38 macallan Exp $ */
+/*	$NetBSD: interrupts.c,v 1.8 2021/01/26 14:49:41 thorpej Exp $ */
 /*-
  * Copyright (c) 2007 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupts.c,v 1.7 2018/05/11 22:48:38 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupts.c,v 1.8 2021/01/26 14:49:41 thorpej Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <prop/proplib.h>
 #include <machine/intr.h>
 #include <machine/autoconf.h>
 #include <powerpc/pic/picvar.h>
 #include <powerpc/pic/ipivar.h>
 @@ -71,27 +71,27 @@ init_openpic(int pass_through)
 	int      pic, macio;
 	macio = OF_finddevice("/pci/mac-io");
 	if (macio == -1)
 		macio = OF_finddevice("mac-io");
 	if (macio == -1)
 		macio = OF_finddevice("/ht/pci/mac-io");
 	if (macio == -1)
 		return FALSE;
 	aprint_debug("macio: %08x\n", macio);
 	pic = OF_child(macio);
-	while ((pic != 0) && (of_compatible(pic, compat) == -1))
+	while ((pic != 0) && !of_compatible(pic, compat))
 		pic = OF_peer(pic);
 	aprint_debug("pic: %08x\n", pic);
 	if ((pic == -1) || (pic == 0))
 		return FALSE;
 	if (OF_getprop(macio, "assigned-addresses", reg, sizeof(reg)) != 20)
 		return FALSE;
 	obio_base = reg[2];
 	aprint_debug("obio-base: %08x\n", obio_base);
 	if (OF_getprop(pic, "reg", reg, 8) < 8)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.171 2020/07/14 08:55:07 martin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.172 2021/01/26 14:49:41 thorpej Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.171 2020/07/14 08:55:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.172 2021/01/26 14:49:41 thorpej Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_altivec.h"
 #include "opt_multiprocessor.h"
 #include "adb.h"
 #include "zsc.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/bus.h>
 @@ -401,47 +401,47 @@ add_model_specifics(prop_dictionary_t di
 		"PowerBook4,3", "PowerBook6,3", "PowerBook6,5", NULL};
 	const char *clamshell[] = {
 		"PowerBook2,1", "PowerBook2,2", NULL};
 	const char *pismo[] = {
 		"PowerBook3,1", NULL};
 	const char *mini1[] = {
 		"PowerMac10,1", NULL};
 	const char *mini2[] = {
 		"PowerMac10,2", NULL};
 	int node;
 	node = OF_finddevice("/");
-	if (of_compatible(node, bl_rev_models) != -1) {
+	if (of_compatible(node, bl_rev_models)) {
 		prop_dictionary_set_bool(dict, "backlight_level_reverted", 1);
+	}
-	if (of_compatible(node, clamshell) != -1) {
+	if (of_compatible(node, clamshell)) {
 		prop_data_t edid;
 		edid = prop_data_create_nocopy(edid_clamshell, sizeof(edid_clamshell));
 		prop_dictionary_set(dict, "EDID", edid);
 		prop_object_release(edid);
+	}
-	if (of_compatible(node, pismo) != -1) {
+	if (of_compatible(node, pismo)) {
 		prop_data_t edid;
 		edid = prop_data_create_nocopy(edid_pismo, sizeof(edid_pismo));
 		prop_dictionary_set(dict, "EDID", edid);
 		prop_object_release(edid);
+	}
-	if (of_compatible(node, mini1) != -1) {
+	if (of_compatible(node, mini1)) {
 		prop_dictionary_set_bool(dict, "dvi-internal", 1);
+	}
-	if (of_compatible(node, mini2) != -1) {
+	if (of_compatible(node, mini2)) {
 		prop_dictionary_set_bool(dict, "dvi-external", 1);
+	}
+}
 static void
 of_set_palette(void *cookie, int index, int r, int g, int b)
+{
 	int ih = (int)cookie;
 	OF_call_method_1("color!", ih, 4, r, g, b, index);
+}
 static int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pic_heathrow.c,v 1.11 2017/06/16 18:48:22 macallan Exp $ */
+/*	$NetBSD: pic_heathrow.c,v 1.12 2021/01/26 14:49:41 thorpej Exp $ */
 /*-
  * Copyright (c) 2007 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_heathrow.c,v 1.11 2017/06/16 18:48:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_heathrow.c,v 1.12 2021/01/26 14:49:41 thorpej Exp $");
 #include "opt_interrupt.h"
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <machine/pio.h>
 #include <dev/ofw/openfirm.h>
 #include <machine/autoconf.h>
 #include <arch/powerpc/pic/picvar.h>
 @@ -78,27 +78,27 @@ static const char *compat[] = {
 int init_heathrow(void)
+{
 	uint32_t reg[5];
 	uint32_t obio_base;
 	int      heathrow;
 	heathrow = OF_finddevice("/pci/mac-io");
 	if (heathrow == -1)
 		heathrow = OF_finddevice("mac-io");
 	if (heathrow == -1)
 		return FALSE;
-	if (of_compatible(heathrow, compat) == -1)
+	if (! of_compatible(heathrow, compat))
 		return FALSE;
 	if (OF_getprop(heathrow, "assigned-addresses", reg, sizeof(reg)) != 20)
 		return FALSE;
 	obio_base = reg[2];
 	aprint_normal("found heathrow PIC at %08x\n", obio_base);
 	setup_heathrow(obio_base);
 	/* TODO: look for 2nd Heathrow */
 	return TRUE;
+}
 static struct heathrow_ops *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pic_u3_ht.c,v 1.9 2020/07/15 09:58:34 rin Exp $	*/
+/*	$NetBSD: pic_u3_ht.c,v 1.10 2021/01/26 14:49:41 thorpej Exp $	*/
 /*-
  * Copyright (c) 2013 Phileas Fogg
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_u3_ht.c,v 1.9 2020/07/15 09:58:34 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_u3_ht.c,v 1.10 2021/01/26 14:49:41 thorpej Exp $");
 #include "opt_openpic.h"
 #include "opt_interrupt.h"
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <machine/pio.h>
 #include <powerpc/openpic.h>
 @@ -130,31 +130,31 @@ static void u3_ht_establish_ipi(int, int
 int init_u3_ht(void)
+{
 	int u4, pic;
 	uint32_t reg[2];
 	uint32_t base, len, tmp;
 	int bigendian;
 	volatile uint8_t *unin_reg;
 	u4 = OF_finddevice("/u4");
 	if (u4 == -1)
 		return FALSE;
-	if (of_compatible(u4, u3_compat) == -1)
+	if (! of_compatible(u4, u3_compat))
 		return FALSE;
 	pic = OF_child(u4);
- 	while ((pic != 0) && (of_compatible(pic, pic_compat) == -1))
+ 	while ((pic != 0) && !of_compatible(pic, pic_compat))
  		pic = OF_peer(pic);
 	if ((pic == -1) || (pic == 0))
 		return FALSE;
 	if (OF_getprop(u4, "reg", reg, sizeof(reg)) != 8)
 		return FALSE;
 	base = reg[1];
 	/* Enable and reset PIC */
 	unin_reg = mapiodev(base, PAGE_SIZE, false);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_machdep.c,v 1.42 2019/03/01 09:25:59 msaitoh Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.43 2021/01/26 14:49:41 thorpej Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -33,27 +33,27 @@
 /*
  * Machine-specific functions for PCI autoconfiguration.
+ *
  * On PCs, there are two methods of generating PCI configuration cycles.
  * We try to detect the appropriate mechanism for this machine and set
  * up a few function pointers to access the correct method directly.
+ *
  * The configuration method can be hard-coded in the config file by
  * using `options PCI_CONF_MODE=N', where `N' is the configuration mode
  * as defined section 3.6.4.1, `Generating Configuration Cycles'.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.42 2019/03/01 09:25:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.43 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #define _POWERPC_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 @@ -329,27 +329,27 @@ fixpci(int parent, pci_chipset_tag_t pc)
 static void
 fix_cardbus_bridge(int node, pci_chipset_tag_t pc, pcitag_t tag)
+{
 	uint32_t bus_number = 0xffffffff;
 	pcireg_t bi;
 	int bus, dev, fn, ih, len;
 	char path[256];
 #if PB3400_CARDBUS_HACK
 	int root_node;
 	root_node = OF_finddevice("/");
-	if (of_compatible(root_node, pb3400_compat) != -1) {
+	if (of_compatible(root_node, pb3400_compat)) {
 		bus_number = cardbus_number;
 		cardbus_number++;
 	} else {
 #endif
 		ih = OF_open(path);
 		OF_call_method("load-ata", ih, 0, 0);
 		OF_close(ih);
 		OF_getprop(node, "AAPL,bus-id", &bus_number,
 		    sizeof(bus_number));
 #if PB3400_CARDBUS_HACK
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_subr.c,v 1.51 2021/01/26 14:09:11 thorpej Exp $	*/
+/*	$NetBSD: ofw_subr.c,v 1.52 2021/01/26 14:49:41 thorpej Exp $	*/
 /*
  * Copyright 1998
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -24,27 +24,27 @@
  * 3) This software is provided "AS-IS" and any express or implied
  *    warranties, including but not limited to, any implied warranties
  *    of merchantability, fitness for a particular purpose, or
  *    non-infringement are disclaimed. In no event shall DIGITAL be
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.51 2021/01/26 14:09:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.52 2021/01/26 14:49:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/i2c/i2cvar.h>
 #define	OFW_MAX_STACK_BUF_SIZE	256
 #define	OFW_PATH_BUF_SIZE	512
 /*
  * int of_decode_int(p)
 @@ -70,102 +70,85 @@ of_decode_int(const unsigned char *p)
+{
 	unsigned int i = *p++ << 8;
 	i = (i + *p++) << 8;
 	i = (i + *p++) << 8;
 	return (i + *p);
+}
 /*
  * int of_compatible(phandle, strings)
+ *
  * This routine checks an OFW node's "compatible" entry to see if
  * it matches any of the provided strings.
+ *
- * It should be used when determining whether a driver can drive
+ * of_match_compat_data() is the preferred way to perform driver
- * a particular device.
+ * compatibility match.  However, this routine that deals with
  * only strings is useful in some situations and is provided for
  * convenience.
+ *
  * Arguments:
  *	phandle		OFW phandle of device to be checked for
  *			compatibility.
  *	strings		Array of containing expected "compatibility"
  *			property values, presence of any of which
  *			indicates compatibility.
+ *
  * Return Value:
- *	-1 if none of the strings are found in phandle's "compatibility"
+ *	0 if none of the strings are found in phandle's "compatibility"
  *	property, or the reverse index of the matching string in the
- *	phandle's "compatibility" property.
+ *	phandle's "compatibility" property plus 1.
+ *
  * Side Effects:
  *	None.
  */
 int
 of_compatible(int phandle, const char * const *strings)
+{
 	char *prop, propbuf[OFW_MAX_STACK_BUF_SIZE];
 	const char *cp;
-	int proplen, match, rv = -1;
+	int proplen, match = 0;
 	proplen = OF_getproplen(phandle, "compatible");
 	if (proplen <= 0) {
-		return -1;
+		return 0;
+	}
 	prop = kmem_tmpbuf_alloc(proplen, propbuf, sizeof(propbuf), KM_SLEEP);
 	if (OF_getprop(phandle, "compatible", prop, proplen) != proplen) {
 		goto out;
+	}
 	for (; (cp = *strings) != NULL; strings++) {
 		if ((match = strlist_match(prop, proplen, cp)) != 0) {
 			rv = match - 1;
 			break;
+		}
+	}
  out:
 	kmem_tmpbuf_free(prop, proplen, propbuf);
-	return rv;
+	return match;
+}
 /*
  * int of_match_compatible(phandle, strings)
+ *
- * This routine checks an OFW node's "compatible" entry to see if
+ * This function is equivalent to of_compatible(), and its use
- * it matches any of the provided strings.
+ * is deprecated.
  * It should be used when determining whether a driver can drive
  * a particular device.
  * Arguments:
  *	phandle		OFW phandle of device to be checked for
  *			compatibility.
  *	strings		Array of containing expected "compatibility"
  *			property values, presence of any of which
  *			indicates compatibility.
  * Return Value:
  *	0 if none of the strings are found in phandle's "compatibility"
  *	property, or a positive number based on the reverse index of the
  *	matching string in the phandle's "compatibility" property, plus 1.
  * Side Effects:
  *	None.
  */
 int
 of_match_compatible(int phandle, const char * const *strings)
+{
-	return of_compatible(phandle, strings) + 1;
+	return of_compatible(phandle, strings);
+}
 /*
  * int of_match_compat_data(phandle, compat_data)
+ *
  * This routine searches an array of device_compatible_entry structures
  * for a matching "compatible" entry matching the supplied OFW node,
  * and returns a weighted match value corresponding to which string
  * from the "compatible" property was matched, which more weight given
  * to the first string than the last.
+ *
  * It should be used when determining whether a driver can drive
  * a particular device.