Page MenuHomeFreeBSD
Files F151966812

D56203.diff
No OneTemporary
Actions

D56203.diff
View Options

diff --git a/sys/dev/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c
--- a/sys/dev/clk/clk_fixed.c
+++ b/sys/dev/clk/clk_fixed.c
@@ -157,7 +157,7 @@
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
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -527,13 +527,13 @@
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.h b/sys/dev/ofw/openfirm.h
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -108,7 +108,7 @@
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/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -381,11 +381,11 @@
}
/* 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/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1585,7 +1585,7 @@
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);

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 8:06 PM (1 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31350750
Default Alt Text
D56203.diff (2 KB)

Event Timeline