Align OF_getencprop_alloc API with OF_getencprop and OF_getprop_alloc

Change OF_getencprop_alloc semantics to be combination of malloc and
OF_getencprop and return size of the property, not number of elements
allocated.

For the use cases where number of elements is preferred introduce
OF_getencprop_alloc_multi helper function that copies semantics
of OF_getencprop_alloc prior to this change.

This is to make OF_getencprop_alloc and OF_getencprop_alloc_multi
function signatures consistent with OF_getencprop_alloc and
OF_getencprop_alloc_multi.

Functionality-wise this patch is mostly rename of OF_getencprop_alloc
to OF_getencprop_alloc_multi except two calls in ofw_bus_setup_iinfo
where 1 was used as a block size.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index aaec0ee0ba97..f4962731ada2 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -623,7 +623,7 @@ bcm_gpio_get_ro_pins(struct bcm_gpio_softc *sc, phandle_t node,
 	pcell_t *pins;
 
 	/* Get the property data. */
-	npins = OF_getencprop_alloc(node, propname, sizeof(*pins),
+	npins = OF_getencprop_alloc_multi(node, propname, sizeof(*pins),
 	    (void **)&pins);
 	if (npins < 0)
 		return (-1);
@@ -1214,8 +1214,8 @@ bcm_gpio_configure_pins(device_t dev, phandle_t cfgxref)
 	cfgnode = OF_node_from_xref(cfgxref);
 
 	pins = NULL;
-	pintuples = OF_getencprop_alloc(cfgnode, "brcm,pins", sizeof(*pins),
-	    (void **)&pins);
+	pintuples = OF_getencprop_alloc_multi(cfgnode, "brcm,pins",
+	    sizeof(*pins), (void **)&pins);
 
 	char name[32];
 	OF_getprop(cfgnode, "name", &name, sizeof(name));
@@ -1233,8 +1233,8 @@ bcm_gpio_configure_pins(device_t dev, phandle_t cfgxref)
 	}
 
 	pulls = NULL;
-	pulltuples = OF_getencprop_alloc(cfgnode, "brcm,pull", sizeof(*pulls),
-	    (void **)&pulls);
+	pulltuples = OF_getencprop_alloc_multi(cfgnode, "brcm,pull",
+	    sizeof(*pulls), (void **)&pulls);
 
 	if ((pulls != NULL) && (pulltuples != pintuples)) {
 		OF_prop_free(pins);