diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-05 12:28:33 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 12:28:33 (GMT) |
| commit | 433647a7ef9241b963b4636e7f8c3a2159d156f0 (patch) | |
| tree | 15008cb530f46b5f9711efa2d9fc550b11ce2905 /test/dm/bus.c | |
| parent | 7da8680b260b4598d841d9a8432d95d56cb86d9f (diff) | |
| parent | 239ae4a9129b8b9f24a216e127042b255b07ae59 (diff) | |
| download | u-boot-433647a7ef9241b963b4636e7f8c3a2159d156f0.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'test/dm/bus.c')
| -rw-r--r-- | test/dm/bus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/dm/bus.c b/test/dm/bus.c index d94dcf7..6a27735 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -222,7 +222,7 @@ static int test_bus_parent_data(struct unit_test_state *uts) /* Check that it starts at 0 and goes away when device is removed */ parent_data->sum += 5; ut_asserteq(5, parent_data->sum); - device_remove(dev); + device_remove(dev, DM_REMOVE_NORMAL); ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); /* Check that we can do this twice */ @@ -323,7 +323,7 @@ static int dm_test_bus_parent_ops(struct unit_test_state *uts) continue; parent_data = dev_get_parent_priv(dev); ut_asserteq(FLAG_CHILD_PROBED, parent_data->flag); - ut_assertok(device_remove(dev)); + ut_assertok(device_remove(dev, DM_REMOVE_NORMAL)); ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); ut_asserteq_ptr(dms->removed, dev); } @@ -360,7 +360,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) plat->count++; ut_asserteq(1, plat->count); device_probe(dev); - device_remove(dev); + device_remove(dev, DM_REMOVE_NORMAL); ut_asserteq_ptr(plat, dev_get_parent_platdata(dev)); ut_asserteq(1, plat->count); @@ -370,7 +370,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) ut_asserteq(3, child_count); /* Removing the bus should also have no effect (it is still bound) */ - device_remove(bus); + device_remove(bus, DM_REMOVE_NORMAL); for (device_find_first_child(bus, &dev), child_count = 0; dev; device_find_next_child(&dev)) { |