dm: do not set DM_FLAG_ACTIVATED twice

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>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 456426a95796aef86e37fc512de5d04d85e9c799..03cd964b80806972cb02118d4e9dd8bf60b22100 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -284,7 +284,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) {