summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-01 13:52:23 -0600
committerSimon Glass <sjg@chromium.org>2016-05-17 09:54:43 -0600
commita2040facd23b88082b9b40f0aa9bcfd495eab88e (patch)
treeadc314cd94f8a10e4ac5bb228ae8d98c1b54fead /drivers
parent72a85c0d2dfe965c831670f06d3803aaad7bb5b1 (diff)
downloadtalos-obmc-uboot-a2040facd23b88082b9b40f0aa9bcfd495eab88e.tar.gz
talos-obmc-uboot-a2040facd23b88082b9b40f0aa9bcfd495eab88e.zip
dm: core: Allow device names to be freed automatically
Some devices have a name that is stored in allocated memory. At present there is no mechanism to free this memory when the device is unbound. Add a device flag to track whether a name is allocated and a function to add the flag. Free the memory when the device is unbound. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/core/device-remove.c2
-rw-r--r--drivers/core/device.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index e1714b2202..0e56b23fbb 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -112,6 +112,8 @@ int device_unbind(struct udevice *dev)
devres_release_all(dev);
+ if (dev->flags & DM_NAME_ALLOCED)
+ free((char *)dev->name);
free(dev);
return 0;
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 2b12ce7835..5c2dc7021f 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -706,12 +706,18 @@ bool device_is_last_sibling(struct udevice *dev)
return list_is_last(&dev->sibling_node, &parent->child_head);
}
+void device_set_name_alloced(struct udevice *dev)
+{
+ dev->flags |= DM_NAME_ALLOCED;
+}
+
int device_set_name(struct udevice *dev, const char *name)
{
name = strdup(name);
if (!name)
return -ENOMEM;
dev->name = name;
+ device_set_name_alloced(dev);
return 0;
}
OpenPOWER on IntegriCloud