Currently, DM_FLAG_ACTIVATED is set twice; before calling uclass_pre_probe_device() and again before calling drv->probe().

It looks like Simon's intention is the first one. The DM_FLAG_ACTIVATED was moved twice, by commit 02eeb1bbb174 (dm: core: Mark device as active before calling its probe() method), and then by commit 206d4d2b4b30 (dm: core: Mark device as active before calling uclass probe() methods). The first marking was added by the last move.

Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---

drivers/core/device.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/drivers/core/device.c b/drivers/core/device.c index e5291e2..e4097c9 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -264,7 +264,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv) goto fail; }

- dev->flags |= DM_FLAG_ACTIVATED; if (drv->probe) { ret = drv->probe(dev); if (ret) {