Index: clk/clk.c
===================================================================
--- clk/clk.c	(revision 299702)
+++ clk/clk.c	(working copy)
@@ -1241,7 +1241,7 @@
 
 done:
 	if (cells != NULL)
-		free(cells, M_OFWPROP);
+		OF_prop_free(cells);
 	return (rv);
 }
 
@@ -1297,8 +1297,8 @@
 	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 @@
 	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
Index: clk/clk_fixed.c
===================================================================
--- clk/clk_fixed.c	(revision 299702)
+++ clk/clk_fixed.c	(working copy)
@@ -254,13 +254,13 @@
 #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);
 }
 
Index: hwreset/hwreset.c
===================================================================
--- hwreset/hwreset.c	(revision 299702)
+++ hwreset/hwreset.c	(working copy)
@@ -132,12 +132,12 @@
 	/* 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);
 
Index: phy/phy.c
===================================================================
--- phy/phy.c	(revision 299702)
+++ phy/phy.c	(working copy)
@@ -146,12 +146,12 @@
 	/* 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 @@
 	/* 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);
 
Index: regulator/regulator.c
===================================================================
--- regulator/regulator.c	(revision 299702)
+++ regulator/regulator.c	(working copy)
@@ -970,13 +970,13 @@
 	/* 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));