svn commit: r299756 - in head/sys: dev/iicbus powerpc/mpc85xx powerpc/psim

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sat May 14 20:06:38 2016
New Revision: 299756
URL: https://svnweb.freebsd.org/changeset/base/299756

Log:
  Use OF_prop_free instead of direct call to free(9)
  
  Reviewed by:  jhibbits

Modified:
  head/sys/dev/iicbus/adt746x.c
  head/sys/powerpc/mpc85xx/lbc.c
  head/sys/powerpc/psim/iobus.c

Modified: head/sys/dev/iicbus/adt746x.c
==============================================================================
--- head/sys/dev/iicbus/adt746x.c       Sat May 14 20:05:35 2016        
(r299755)
+++ head/sys/dev/iicbus/adt746x.c       Sat May 14 20:06:38 2016        
(r299756)
@@ -361,8 +361,8 @@ adt746x_fill_fan_prop(device_t dev)
        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 @@ adt746x_fill_fan_prop(device_t dev)
                        (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);
 }

Modified: head/sys/powerpc/mpc85xx/lbc.c
==============================================================================
--- head/sys/powerpc/mpc85xx/lbc.c      Sat May 14 20:05:35 2016        
(r299755)
+++ head/sys/powerpc/mpc85xx/lbc.c      Sat May 14 20:06:38 2016        
(r299756)
@@ -408,7 +408,7 @@ fdt_lbc_reg_decode(phandle_t node, struc
        }
        rv = 0;
 out:
-       free(regptr, M_OFWPROP);
+       OF_prop_free(regptr);
        return (rv);
 }
 
@@ -650,11 +650,11 @@ lbc_attach(device_t dev)
         */
        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);
 }

Modified: head/sys/powerpc/psim/iobus.c
==============================================================================
--- head/sys/powerpc/psim/iobus.c       Sat May 14 20:05:35 2016        
(r299755)
+++ head/sys/powerpc/psim/iobus.c       Sat May 14 20:06:38 2016        
(r299756)
@@ -232,7 +232,7 @@ iobus_attach(device_t dev)
                        iobus_add_reg(child, dinfo, sc->sc_addr);
                         device_set_ivars(cdev, dinfo);
                 } else {
-                        free(name, M_OFWPROP);
+                        OF_prop_free(name);
                 }
         }
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"