From f4eefe43b218cf1e7750bf2fa89ac601de61feb8 Mon Sep 17 00:00:00 2001
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 14 May 2016 04:59:36 +0000
Subject: Use OF_prop_free instead of direct call to free(9)

Reviewed by:	mmel@
---
 sys/dev/extres/clk/clk.c             | 10 +++++-----
 sys/dev/extres/clk/clk_fixed.c       |  8 ++++----
 sys/dev/extres/hwreset/hwreset.c     |  4 ++--
 sys/dev/extres/phy/phy.c             |  8 ++++----
 sys/dev/extres/regulator/regulator.c |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'sys/dev/extres')

diff --git a/sys/dev/extres/clk/clk.c b/sys/dev/extres/clk/clk.c
index 07cbd6b32198..5b9eeb68636c 100644
--- a/sys/dev/extres/clk/clk.c
+++ b/sys/dev/extres/clk/clk.c
@@ -1241,7 +1241,7 @@ clk_get_by_ofw_index(device_t dev, int idx, clk_t *clk)
 
 done:
 	if (cells != NULL)
-		free(cells, M_OFWPROP);
+		OF_prop_free(cells);
 	return (rv);
 }
 
@@ -1297,8 +1297,8 @@ clk_parse_ofw_out_names(device_t dev, phandle_t node, const char ***out_names,
 	if (rv != name_items) {
 		device_printf(dev, " Size of 'clock-output-names' and "
 		    "'clock-indices' differs\n");
-		free(*out_names, M_OFWPROP);
-		free(*indices, M_OFWPROP);
+		OF_prop_free(*out_names);
+		OF_prop_free(*indices);
 		return (0);
 	}
 	return (name_items);
@@ -1325,12 +1325,12 @@ clk_parse_ofw_clk_name(device_t dev, phandle_t node, const char **name)
 	rv = ofw_bus_string_list_to_array(node, "clock-output-names",
 	    &out_names);
 	if (rv != 1) {
-		free(out_names, M_OFWPROP);
+		OF_prop_free(out_names);
 		device_printf(dev, "Malformed 'clock-output-names' property\n");
 		return (ENXIO);
 	}
 	*name = strdup(out_names[0], M_OFWPROP);
-	free(out_names, M_OFWPROP);
+	OF_prop_free(out_names);
 	return (0);
 }
 #endif
diff --git a/sys/dev/extres/clk/clk_fixed.c b/sys/dev/extres/clk/clk_fixed.c
index 02721ae86d73..133a38a6c014 100644
--- a/sys/dev/extres/clk/clk_fixed.c
+++ b/sys/dev/extres/clk/clk_fixed.c
@@ -254,13 +254,13 @@ clk_fixed_attach(device_t dev)
 #ifdef CLK_DEBUG
 	clkdom_dump(sc->clkdom);
 #endif
-	free(__DECONST(char *, def.clkdef.name), M_OFWPROP);
-	free(def.clkdef.parent_names, M_OFWPROP);
+	OF_prop_free(__DECONST(char *, def.clkdef.name));
+	OF_prop_free(def.clkdef.parent_names);
 	return (bus_generic_attach(dev));
 
 fail:
-	free(__DECONST(char *, def.clkdef.name), M_OFWPROP);
-	free(def.clkdef.parent_names, M_OFWPROP);
+	OF_prop_free(__DECONST(char *, def.clkdef.name));
+	OF_prop_free(def.clkdef.parent_names);
 	return (rv);
 }
 
diff --git a/sys/dev/extres/hwreset/hwreset.c b/sys/dev/extres/hwreset/hwreset.c
index b3493de883c8..8623b60e5b23 100644
--- a/sys/dev/extres/hwreset/hwreset.c
+++ b/sys/dev/extres/hwreset/hwreset.c
@@ -132,12 +132,12 @@ hwreset_get_by_ofw_idx(device_t consumer_dev, int idx, hwreset_t *rst)
 	/* Tranlate provider to device */
 	rstdev = OF_device_from_xref(xnode);
 	if (rstdev == NULL) {
-		free(cells, M_OFWPROP);
+		OF_prop_free(cells);
 		return (ENODEV);
 	}
 	/* Map reset to number */
 	rv = HWRESET_MAP(rstdev, xnode, ncells, cells, &id);
-	free(cells, M_OFWPROP);
+	OF_prop_free(cells);
 	if (rv != 0)
 		return (rv);
 
diff --git a/sys/dev/extres/phy/phy.c b/sys/dev/extres/phy/phy.c
index 0e2c7e14f58b..a4dc621d905e 100644
--- a/sys/dev/extres/phy/phy.c
+++ b/sys/dev/extres/phy/phy.c
@@ -146,12 +146,12 @@ phy_get_by_ofw_idx(device_t consumer_dev, int idx, phy_t *phy)
 	/* Tranlate provider to device. */
 	phydev = OF_device_from_xref(xnode);
 	if (phydev == NULL) {
-		free(cells, M_OFWPROP);
+		OF_prop_free(cells);
 		return (ENODEV);
 	}
 	/* Map phy to number. */
 	rv = PHY_MAP(phydev, xnode, ncells, cells, &id);
-	free(cells, M_OFWPROP);
+	OF_prop_free(cells);
 	if (rv != 0)
 		return (rv);
 
@@ -199,12 +199,12 @@ phy_get_by_ofw_property(device_t consumer_dev, char *name, phy_t *phy)
 	/* Tranlate provider to device. */
 	phydev = OF_device_from_xref(cells[0]);
 	if (phydev == NULL) {
-		free(cells, M_OFWPROP);
+		OF_prop_free(cells);
 		return (ENODEV);
 	}
 	/* Map phy to number. */
 	rv = PHY_MAP(phydev, cells[0], ncells - 1 , cells + 1, &id);
-	free(cells, M_OFWPROP);
+	OF_prop_free(cells);
 	if (rv != 0)
 		return (rv);
 
diff --git a/sys/dev/extres/regulator/regulator.c b/sys/dev/extres/regulator/regulator.c
index b941aa15ea23..84cd8fde4548 100644
--- a/sys/dev/extres/regulator/regulator.c
+++ b/sys/dev/extres/regulator/regulator.c
@@ -970,13 +970,13 @@ regulator_get_by_ofw_property(device_t cdev, char *name,  regulator_t *reg)
 	/* Translate xref to device */
 	regdev = OF_device_from_xref(cells[0]);
 	if (regdev == NULL) {
-		free(cells, M_OFWPROP);
+		OF_prop_free(cells);
 		return (ENODEV);
 	}
 
 	/* Map regulator to number */
 	rv = REGDEV_MAP(regdev, cells[0], ncells - 1, cells + 1, &id);
-	free(cells, M_OFWPROP);
+	OF_prop_free(cells);
 	if (rv != 0)
 		return (rv);
 	return (regulator_get_by_id(cdev, regdev, id, reg));
-- 
cgit v1.2.3