dm: do not set DM_FLAG_ACTIVATED twice
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 9 Jul 2015 13:11:49 +0000 (22:11 +0900)
committerSimon Glass <sjg@chromium.org>
Tue, 21 Jul 2015 23:39:34 +0000 (17:39 -0600)
commit1f5dd4700a588f389f074491e2b7710e53df66e3
tree4ca361538f70dc7259af88c1a0463ce759ddfb5e
parent643e69021ef921c6ea63da9fc274c0de5a3d0eed
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>
drivers/core/device.c