From nobody Thu Jul 9 17:49:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gx2XW1HYDz6kZc2 for ; Thu, 09 Jul 2026 17:49:31 +0000 (UTC) (envelope-from git@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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gx2XW0jKxz3h6q for ; Thu, 09 Jul 2026 17:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783619371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5VYyz1ovJERlFWqiEkPcp95E8gQ0bSxW0s/4F7sFjF8=; b=kcg0GZ7UQr4bg1qCGsCyVw6LQHwP73pSVx1f4J4NwVFBsglxUsUurK5TAF37cSqtFlCpWA qsJp+Xv0FyKB663hlv/t6PENgaui2Q11oMsgIaLpR0IfdYXPrDNbirlNBL+QAiO7yPJRt/ Ck2E09a4KbYnipg+8tNt9z/Iwi6lgJKIDPsQCh9zLDzV3E0W1mJOpoa8bGarsDAbgK6W35 99FSATgYLslBI5VEsaMp8xPOGR0R4oTb0gz1OX7yTiJW61gEKCDfA3ARj2WVFBPzHFyml0 pZ89kAQSpniuNO2vIiTi9h0z5NzXmX/VTk7UEdflFLRz79KvS1RrxffwACSnFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783619371; a=rsa-sha256; cv=none; b=DnSzet7YT7X8vq2+az+oK9T3dgFUfIgstJpQBgKjJe9yLiNTzcNHA0pX5lJmPM1rU1DbuP hj7Taf02X2yzsPUQnjmD3apkd5pcDi0e/dkvYL59cYI/bRTW3bEhf0SXkyigyDChPAiiSU 2w2lo+LaOUWPgzU5RozzaUOU4b/YRN7cxM2gLfL7+0HeduLeHDN0HlPdNEgDu/oVXFZYFU ewhfU9eiy8T3QTrE5n3IyZvWaEQTg99CFWSOyhYK6Ej3SzOKRIOkcfl30rRrtxginujHzC oiBeMNKzJ52D5g9jdhycknbi7nYCrFQEovR86yYBUFBx51Iy7MqgyLJNFwCLRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783619371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5VYyz1ovJERlFWqiEkPcp95E8gQ0bSxW0s/4F7sFjF8=; b=EzA3gnI2FJkO/IQDXobG4Zf2Ui/p/IIO2650lZmnk/WGS4rtHmtiTAT2hTiXXdKEE23bRQ IQrwXwrZ7UapjLa5nwrfCUKDfYOfVXN1/EZ9vSPrvqeE8VZHLveB4D9GXMlvw3NVQRCxJK cjRmUW0iXG32lSQuMfD9BT47LX5JHAlZSQrTZdn9rloyRTZJdQup4ZyLLM7wyv0ZBYy8xm LntGhC8l3Eoq+LlO7z2NAVXkX3r4dAMcGB9rVMTp1UJx/Eq3DV7K94tI1HCJUTZazLoCKr mwb9YdB8+mrMIB1s49cb2CQWSNm38vlq8e+VsAIZLrSP96DT0pAhkQCw4B2igg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gx2XV6kr1z3mv for ; Thu, 09 Jul 2026 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fecd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Jul 2026 17:49:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 64f6ab4a39f9 - stable/15 - ofw: bool-ify OF_hasprop() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 64f6ab4a39f93b426ae54937ce36d08afd83841c Auto-Submitted: auto-generated Date: Thu, 09 Jul 2026 17:49:30 +0000 Message-Id: <6a4fdf2a.3fecd.65bae182@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=64f6ab4a39f93b426ae54937ce36d08afd83841c commit 64f6ab4a39f93b426ae54937ce36d08afd83841c Author: Mitchell Horne AuthorDate: 2026-04-16 14:12:41 +0000 Commit: Mitchell Horne CommitDate: 2026-07-09 17:48:06 +0000 ofw: bool-ify OF_hasprop() Adjust the function signature and the few callers that don't treat it this way already. This is style only; no functional change intended. Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56203 (cherry picked from commit b60cd486a652f0427e525b4482ac598be5460459) --- sys/dev/clk/clk_fixed.c | 2 +- sys/dev/dwc/if_dwc.c | 8 ++++---- sys/dev/ofw/openfirm.c | 4 ++-- sys/dev/ofw/openfirm.h | 2 +- sys/dev/usb/net/if_smsc.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c index f8dcfb8378cd..f18b8f8904c6 100644 --- a/sys/dev/clk/clk_fixed.c +++ b/sys/dev/clk/clk_fixed.c @@ -157,7 +157,7 @@ clk_fixed_probe(device_t dev) clk_type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; switch (clk_type) { case CLK_TYPE_FIXED: - if (OF_hasprop(ofw_bus_get_node(dev), "clock-frequency") == 0) { + if (!OF_hasprop(ofw_bus_get_node(dev), "clock-frequency")) { device_printf(dev, "clock-fixed has no clock-frequency\n"); return (ENXIO); diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 21a520db8b89..cd8651cc99ff 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -527,13 +527,13 @@ dwc_attach(device_t dev) sc->txpbl = pbl; if (OF_getencprop(sc->node, "snps,rxpbl", &sc->rxpbl, sizeof(uint32_t)) <= 0) sc->rxpbl = pbl; - if (OF_hasprop(sc->node, "snps,no-pbl-x8") == 1) + if (OF_hasprop(sc->node, "snps,no-pbl-x8")) sc->nopblx8 = true; - if (OF_hasprop(sc->node, "snps,fixed-burst") == 1) + if (OF_hasprop(sc->node, "snps,fixed-burst")) sc->fixed_burst = true; - if (OF_hasprop(sc->node, "snps,mixed-burst") == 1) + if (OF_hasprop(sc->node, "snps,mixed-burst")) sc->mixed_burst = true; - if (OF_hasprop(sc->node, "snps,aal") == 1) + if (OF_hasprop(sc->node, "snps,aal")) sc->aal = true; error = clk_set_assigned(dev, ofw_bus_get_node(dev)); diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index b5f58b86a9c3..a8d3786ed152 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -381,11 +381,11 @@ OF_getproplen(phandle_t package, const char *propname) } /* Check existence of a property of a package. */ -int +bool OF_hasprop(phandle_t package, const char *propname) { - return (OF_getproplen(package, propname) >= 0 ? 1 : 0); + return (OF_getproplen(package, propname) >= 0); } /* Get the value of a property of a package. */ diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h index 4e2b035827cb..fd13f4abd29e 100644 --- a/sys/dev/ofw/openfirm.h +++ b/sys/dev/ofw/openfirm.h @@ -108,7 +108,7 @@ ssize_t OF_getprop(phandle_t node, const char *propname, void *buf, size_t len); ssize_t OF_getencprop(phandle_t node, const char *prop, pcell_t *buf, size_t len); /* Same as getprop, but maintains endianness */ -int OF_hasprop(phandle_t node, const char *propname); +bool OF_hasprop(phandle_t node, const char *propname); ssize_t OF_searchprop(phandle_t node, const char *propname, void *buf, size_t len); ssize_t OF_searchencprop(phandle_t node, const char *propname, diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 498a9ee3f926..c3c21fd22472 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1585,7 +1585,7 @@ smsc_bootargs_get_mac_addr(device_t dev, struct usb_ether *ue) node = OF_finddevice("/chosen"); if (node == -1) return (false); - if (OF_hasprop(node, "bootargs") == 0) { + if (!OF_hasprop(node, "bootargs")) { smsc_dbg_printf((struct smsc_softc *)ue->ue_sc, "bootargs not found"); return (false);