Index: dev/iicbus/adt746x.c
===================================================================
--- dev/iicbus/adt746x.c	(revision 299702)
+++ dev/iicbus/adt746x.c	(working copy)
@@ -361,8 +361,8 @@
 	location_len = OF_getprop_alloc(child, "hwctrl-location", 1, (void **)&location);
 	id_len = OF_getprop_alloc(child, "hwctrl-id", sizeof(cell_t), (void **)&id);
 	if (location_len == -1 || id_len == -1) {
-		free(location, M_OFWPROP);
-		free(id, M_OFWPROP);
+		OF_prop_free(location);
+		OF_prop_free(id);
 		return 0;
 	}
 
@@ -390,8 +390,8 @@
 			(int (*)(struct pmac_fan *, int))(adt746x_fan_set_pwm);
 		sc->sc_fans[i].fan.default_rpm = sc->sc_fans[i].fan.max_rpm;
 	}
-	free(location, M_OFWPROP);
-	free(id, M_OFWPROP);
+	OF_prop_free(location);
+	OF_prop_free(id);
 
 	return (i);
 }
Index: powerpc/mpc85xx/lbc.c
===================================================================
--- powerpc/mpc85xx/lbc.c	(revision 299702)
+++ powerpc/mpc85xx/lbc.c	(working copy)
@@ -408,7 +408,7 @@
 	}
 	rv = 0;
 out:
-	free(regptr, M_OFWPROP);
+	OF_prop_free(regptr);
 	return (rv);
 }
 
@@ -650,11 +650,11 @@
 	 */
 	lbc_banks_enable(sc);
 
-	free(rangesptr, M_OFWPROP);
+	OF_prop_free(rangesptr);
 	return (bus_generic_attach(dev));
 
 fail:
-	free(rangesptr, M_OFWPROP);
+	OF_prop_free(rangesptr);
 	bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_mrid, sc->sc_mres);
 	return (error);
 }
Index: powerpc/psim/iobus.c
===================================================================
--- powerpc/psim/iobus.c	(revision 299702)
+++ powerpc/psim/iobus.c	(working copy)
@@ -232,7 +232,7 @@
 			iobus_add_reg(child, dinfo, sc->sc_addr);
                         device_set_ivars(cdev, dinfo);
                 } else {
-                        free(name, M_OFWPROP);
+                        OF_prop_free(name);
                 }
         }