From: Masahiro Yamada Date: Sat, 25 Jul 2015 12:52:34 +0000 (+0900) Subject: dm: add DM_FLAG_BOUND flag X-Git-Tag: v2015.10-rc2~394^2~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aed1a4dd88e94001b811b297c1ff734c3f8d22d9;p=u-boot dm: add DM_FLAG_BOUND flag Currently, we only have DM_FLAG_ACTIVATED to indicate the device status, but we still cannot know in which stage is in progress, binding or probing. This commit introduces a new flag, DM_FLAG_BOUND, which is set when the device is really bound, and cleared when it is unbound. Signed-off-by: Masahiro Yamada Acked-by: Simon Glass --- diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 6b87f865e4..45d6543067 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -61,6 +61,9 @@ int device_unbind(struct udevice *dev) if (dev->flags & DM_FLAG_ACTIVATED) return -EINVAL; + if (!(dev->flags & DM_FLAG_BOUND)) + return -EINVAL; + drv = dev->driver; assert(drv); diff --git a/drivers/core/device.c b/drivers/core/device.c index d65717ddc7..bf6f2716da 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -132,6 +132,8 @@ int device_bind(struct udevice *parent, const struct driver *drv, dm_dbg("Bound device %s to %s\n", dev->name, parent->name); *devp = dev; + dev->flags |= DM_FLAG_BOUND; + return 0; fail_child_post_bind: diff --git a/include/dm/device.h b/include/dm/device.h index 12fd02d09a..4cd7ba3386 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -36,6 +36,9 @@ struct driver_info; /* Allocate driver private data on a DMA boundary */ #define DM_FLAG_ALLOC_PRIV_DMA (1 << 5) +/* Device is bound */ +#define DM_FLAG_BOUND (1 << 6) + /** * struct udevice - An instance of a driver *