aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorOleksandr Tymoshenko <gonzo@FreeBSD.org>2016-05-18 23:39:31 +0000
committerOleksandr Tymoshenko <gonzo@FreeBSD.org>2016-05-18 23:39:31 +0000
commit14131c0ba4a53ac9a4b7bd4e4fc49d2d1f3a03cc (patch)
tree1399bc8174a3b46161046ea08db47a9d04ed730d /sys/dev
parent4441bd735ff93775e6490020f853f8d63ca3993f (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/atkbdc/atkbdc_ebus.c10
-rw-r--r--sys/dev/le/lebuffer_sbus.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/atkbdc/atkbdc_ebus.c b/sys/dev/atkbdc/atkbdc_ebus.c
index fd6443e8bf32..7662ee10e99f 100644
--- a/sys/dev/atkbdc/atkbdc_ebus.c
+++ b/sys/dev/atkbdc/atkbdc_ebus.c
@@ -242,14 +242,14 @@ atkbdc_ebus_attach(device_t dev)
device_printf(dev,
"<%s>: only two children per 8042 supported\n",
cname);
- free(cname, M_OFWPROP);
+ OF_prop_free(cname);
continue;
}
adi = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV,
M_NOWAIT | M_ZERO);
if (adi == NULL) {
device_printf(dev, "<%s>: malloc failed\n", cname);
- free(cname, M_OFWPROP);
+ OF_prop_free(cname);
continue;
}
if (strcmp(cname, "kb_ps2") == 0) {
@@ -261,7 +261,7 @@ atkbdc_ebus_attach(device_t dev)
} else {
device_printf(dev, "<%s>: unknown device\n", cname);
free(adi, M_ATKBDDEV);
- free(cname, M_OFWPROP);
+ OF_prop_free(cname);
continue;
}
intr = bus_get_resource_start(dev, SYS_RES_IRQ, adi->rid);
@@ -270,7 +270,7 @@ atkbdc_ebus_attach(device_t dev)
"<%s>: cannot determine interrupt resource\n",
cname);
free(adi, M_ATKBDDEV);
- free(cname, M_OFWPROP);
+ OF_prop_free(cname);
continue;
}
resource_list_init(&adi->resources);
@@ -281,7 +281,7 @@ atkbdc_ebus_attach(device_t dev)
cname);
resource_list_free(&adi->resources);
free(adi, M_ATKBDDEV);
- free(cname, M_OFWPROP);
+ OF_prop_free(cname);
continue;
}
device_set_ivars(cdev, adi);
diff --git a/sys/dev/le/lebuffer_sbus.c b/sys/dev/le/lebuffer_sbus.c
index f2c7c5f9fca2..1dc948809f5f 100644
--- a/sys/dev/le/lebuffer_sbus.c
+++ b/sys/dev/le/lebuffer_sbus.c
@@ -197,7 +197,7 @@ lebuffer_setup_dinfo(device_t dev, phandle_t node)
if (slot != -1 && slot != rslot) {
device_printf(dev, "<%s>: multiple slots\n",
ldi->ldi_obdinfo.obd_name);
- free(reg, M_OFWPROP);
+ OF_prop_free(reg);
goto fail;
}
slot = rslot;
@@ -205,7 +205,7 @@ lebuffer_setup_dinfo(device_t dev, phandle_t node)
resource_list_add(&ldi->ldi_rl, SYS_RES_MEMORY, i, base,
base + reg[i].sbr_size, reg[i].sbr_size);
}
- free(reg, M_OFWPROP);
+ OF_prop_free(reg);
if (slot != sbus_get_slot(dev)) {
device_printf(dev, "<%s>: parent and child slot do not match\n",
ldi->ldi_obdinfo.obd_name);
@@ -231,7 +231,7 @@ lebuffer_setup_dinfo(device_t dev, phandle_t node)
resource_list_add(&ldi->ldi_rl, SYS_RES_IRQ, i,
iv, iv, 1);
}
- free(intr, M_OFWPROP);
+ OF_prop_free(intr);
}
return (ldi);