Index: as3722_gpio.c
===================================================================
--- as3722_gpio.c	(revision 299472)
+++ as3722_gpio.c	(working copy)
@@ -254,9 +254,9 @@
 	} while (len < lpins);
 
 	if (pins != NULL)
-		free(pins, M_OFWPROP);
+		OF_prop_free(pins);
 	if (cfg.function != NULL)
-		free(cfg.function, M_OFWPROP);
+		OF_prop_free(cfg.function);
 
 	return (rv);
 }
Index: tegra124/tegra124_coretemp.c
===================================================================
--- tegra124/tegra124_coretemp.c	(revision 299472)
+++ tegra124/tegra124_coretemp.c	(working copy)
@@ -164,7 +164,7 @@
 	}
 
 	sc->tsens_id = 0x100 + sc->cpu_id; //cells[0];
-	free(cells, M_OFWPROP);
+	OF_prop_free(cells);
 
 	sc->tsens_dev = OF_device_from_xref(xnode);
 	if (sc->tsens_dev == NULL) {
Index: tegra124/tegra124_xusbpadctl.c
===================================================================
--- tegra124/tegra124_xusbpadctl.c	(revision 299472)
+++ tegra124/tegra124_xusbpadctl.c	(working copy)
@@ -274,9 +274,9 @@
 	} while (len < llanes);
 
 	if (lanes != NULL)
-		free(lanes, M_OFWPROP);
+		OF_prop_free(lanes);
 	if (cfg.function != NULL)
-		free(cfg.function, M_OFWPROP);
+		OF_prop_free(cfg.function);
 	return (rv);
 }
 
Index: tegra_pinmux.c
===================================================================
--- tegra_pinmux.c	(revision 299472)
+++ tegra_pinmux.c	(working copy)
@@ -693,9 +693,9 @@
 	} while (len < lpins);
 
 	if (pins != NULL)
-		free(pins, M_OFWPROP);
+		OF_prop_free(pins);
 	if (cfg.function != NULL)
-		free(cfg.function, M_OFWPROP);
+		OF_prop_free(cfg.function);
 	return (rv);
 }
 
Index: tegra_usbphy.c
===================================================================
--- tegra_usbphy.c	(revision 299472)
+++ tegra_usbphy.c	(working copy)
@@ -593,7 +593,7 @@
 		ret = USB_IFC_TYPE_ULPI;
 	else
 		device_printf(dev, "Unsupported phy type: %s\n", tmpstr);
-	free(tmpstr, M_OFWPROP);
+	OF_prop_free(tmpstr);
 	return (ret);
 }
 
@@ -617,7 +617,7 @@
 		ret = USB_DR_MODE_OTG;
 	else
 		device_printf(dev, "Unknown dr mode: %s\n", tmpstr);
-	free(tmpstr, M_OFWPROP);
+	OF_prop_free(tmpstr);
 	return (ret);
 }