diff options
| author | Simon Glass <sjg@chromium.org> | 2016-07-04 17:58:15 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-15 02:40:24 (GMT) |
| commit | fd1c2d9b6a3a9b41ae070ca47361bd6cc6aaaf09 (patch) | |
| tree | d0b5a714bc52a00516b0acb7dfc8d141154a70c6 | |
| parent | 7d23b9cf2b1a5a86f7e89a443e3a2de9dac8a9ad (diff) | |
| download | u-boot-fd1c2d9b6a3a9b41ae070ca47361bd6cc6aaaf09.tar.xz | |
dm: core: Rename DM_NAME_ALLOCED to DM_FLAG_NAME_ALLOCED
This is a flag. Adjust the name to be consistent with the other flags.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/device-remove.c | 2 | ||||
| -rw-r--r-- | drivers/core/device.c | 2 | ||||
| -rw-r--r-- | include/dm/device.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 0e56b23..a7f77b4 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -112,7 +112,7 @@ int device_unbind(struct udevice *dev) devres_release_all(dev); - if (dev->flags & DM_NAME_ALLOCED) + if (dev->flags & DM_FLAG_NAME_ALLOCED) free((char *)dev->name); free(dev); diff --git a/drivers/core/device.c b/drivers/core/device.c index d8f9d5b..6967c3d 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -738,7 +738,7 @@ bool device_is_last_sibling(struct udevice *dev) void device_set_name_alloced(struct udevice *dev) { - dev->flags |= DM_NAME_ALLOCED; + dev->flags |= DM_FLAG_NAME_ALLOCED; } int device_set_name(struct udevice *dev, const char *name) diff --git a/include/dm/device.h b/include/dm/device.h index 1bfcf3b..fc35f4d 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -42,7 +42,7 @@ struct driver_info; #define DM_FLAG_BOUND (1 << 6) /* Device name is allocated and should be freed on unbind() */ -#define DM_NAME_ALLOCED (1 << 7) +#define DM_FLAG_NAME_ALLOCED (1 << 7) /** * struct udevice - An instance of a driver @@ -553,7 +553,7 @@ int device_set_name(struct udevice *dev, const char *name); /** * device_set_name_alloced() - note that a device name is allocated * - * This sets the DM_NAME_ALLOCED flag for the device, so that when it is + * This sets the DM_FLAG_NAME_ALLOCED flag for the device, so that when it is * unbound the name will be freed. This avoids memory leaks. * * @dev: Device to update |