Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Apr 2026 16:15:45 +0000
From:      Mitchell Horne <mhorne@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ce6b4973ba8c - main - raspberry_virtgpio: fix OF_hasprop() usage
Message-ID:  <69e10b31.258e2.7c6936b6@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=ce6b4973ba8c6503d3b6dc12d9e6b42ce274d912

commit ce6b4973ba8c6503d3b6dc12d9e6b42ce274d912
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2026-04-16 16:05:25 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2026-04-16 16:15:41 +0000

    raspberry_virtgpio: fix OF_hasprop() usage
    
    The function returns a bool. This driver was merged recently (by me) and
    I missed this instance.
    
    While here, adjust the ofw_bus_status_okay() call similarly. This
    function still returns an int, but this usage is more widely used in our
    drivers.
    
    No functional change intended.
    
    MFC after:      3 days
    Sponsored by:   The FreeBSD Foundation
    Fixes:          b60cd486a652 ("ofw: bool-ify OF_hasprop()")
---
 sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c b/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
index 64ce6fda6306..797896a7f22b 100644
--- a/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
+++ b/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
@@ -206,14 +206,14 @@ rpi_virt_gpio_probe(device_t dev)
 	union msg_gpiovirtbuf cfg;
 	int rv;
 
-	if (ofw_bus_status_okay(dev) == 0)
+	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
 	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
 		return (ENXIO);
 
 	gpio = ofw_bus_get_node(dev);
-	if (OF_hasprop(gpio, "gpio-controller") == 0)
+	if (!OF_hasprop(gpio, "gpio-controller"))
 		return (ENXIO);
 
 	/* Check whether the firmware is ready. */


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e10b31.258e2.7c6936b6>