diff options
| author | thorpej <thorpej@NetBSD.org> | 2021-01-26 14:49:41 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2021-01-26 14:49:41 +0000 |
| commit | bab8cb272c239e920addb60dcd4c93049dacd99b (patch) | |
| tree | a7dd5ba939404ab097cb4c86acbdd39367b9542e /sys/arch/macppc/dev | |
| parent | 7702b061e25447a1766d6445357a40b906ec3d00 (diff) | |
There is not much point in of_compatible() returning -1 for "no match"
and >= 0 for "match". Just make it return 0 for "no match" and >0 for
"match" so it can be treated like a boolean expression.
As such of_match_compatible() (a wrapper around of_compatible()) is now
obsolete, and will be removed once all call sites are converted to an
appropriate replacement.
Diffstat (limited to 'sys/arch/macppc/dev')
| -rw-r--r-- | sys/arch/macppc/dev/awacs.c | 16 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/mediabay.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/obio.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/pmu.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/wdc_obio.c | 6 |
5 files changed, 20 insertions, 22 deletions
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c index 45b44305d36..960773d96ca 100644 --- a/sys/arch/macppc/dev/awacs.c +++ b/sys/arch/macppc/dev/awacs.c @@ -1,4 +1,4 @@ -/* $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. @@ -27,7 +27,7 @@ */ #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> @@ -373,7 +373,7 @@ awacs_attach(device_t parent, device_t self, void *aux) 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; @@ -381,8 +381,7 @@ awacs_attach(device_t parent, device_t self, void *aux) sound_node = OF_child(ca->ca_node); while ((sound_node != 0) && (!sc->sc_screamer)) { - sc->sc_screamer = - (of_compatible(sound_node, screamer) != -1); + sc->sc_screamer = of_compatible(sound_node, screamer); sound_node = OF_peer(sound_node); } } @@ -426,7 +425,7 @@ awacs_attach(device_t parent, device_t self, void *aux) */ 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 */ /* @@ -435,8 +434,7 @@ awacs_attach(device_t parent, device_t self, void *aux) */ sc->sc_headphones_mask = 0x8; sc->sc_headphones_in = 0x0; - } else if ((perch != -1) || - (of_compatible(root_node, use_gpio4) != -1)) { + } else if ((perch != -1) || of_compatible(root_node, use_gpio4)) { /* * this is for the beige G3's 'personality card' which uses * yet another wiring of the headphone detect GPIOs @@ -450,7 +448,7 @@ awacs_attach(device_t parent, device_t self, void *aux) 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; diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c index 353c20106f1..b907ba46933 100644 --- a/sys/arch/macppc/dev/mediabay.c +++ b/sys/arch/macppc/dev/mediabay.c @@ -1,4 +1,4 @@ -/* $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. @@ -27,7 +27,7 @@ */ #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> @@ -132,7 +132,7 @@ mediabay_attach(device_t parent, device_t self, void *aux) 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 { diff --git a/sys/arch/macppc/dev/obio.c b/sys/arch/macppc/dev/obio.c index 64a3686bea5..3cbd2e73573 100644 --- a/sys/arch/macppc/dev/obio.c +++ b/sys/arch/macppc/dev/obio.c @@ -1,4 +1,4 @@ -/* $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. @@ -32,7 +32,7 @@ */ #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> @@ -368,7 +368,7 @@ obio_setup_gpios(struct obio_softc *sc, int node) 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) diff --git a/sys/arch/macppc/dev/pmu.c b/sys/arch/macppc/dev/pmu.c index 242f8946d53..ae57229025f 100644 --- a/sys/arch/macppc/dev/pmu.c +++ b/sys/arch/macppc/dev/pmu.c @@ -1,4 +1,4 @@ -/* $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 @@ -27,7 +27,7 @@ */ #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> @@ -428,10 +428,10 @@ next: } /* 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); diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c index dde436ed14f..7ecc4ef3400 100644 --- a/sys/arch/macppc/dev/wdc_obio.c +++ b/sys/arch/macppc/dev/wdc_obio.c @@ -1,4 +1,4 @@ -/* $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. @@ -30,7 +30,7 @@ */ #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> @@ -107,7 +107,7 @@ wdc_obio_match(device_t parent, cfdata_t match, void *aux) 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; |
