X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fdm%2Fbus.c;h=a215905add9b74be16c11f233e7e63d65c24833f;hb=40b6f2d020ca8074ed38a1b6bfa170aead1a170e;hp=116a52db59c8c48845146fa9ecd417deb1ba076a;hpb=1733259d25015c28c47990ec11af99b3f62f811c;p=oweals%2Fu-boot.git diff --git a/test/dm/bus.c b/test/dm/bus.c index 116a52db59..a215905add 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -104,7 +104,7 @@ UCLASS_DRIVER(testbus) = { }; /* Test that we can probe for children */ -static int dm_test_bus_children(struct dm_test_state *dms) +static int dm_test_bus_children(struct unit_test_state *uts) { int num_devices = 6; struct udevice *bus; @@ -120,14 +120,14 @@ static int dm_test_bus_children(struct dm_test_state *dms) ut_assertok(uclass_get(UCLASS_TEST_FDT, &uc)); ut_asserteq(num_devices, list_count_items(&uc->dev_head)); - ut_assert(!dm_check_devices(dms, num_devices)); + ut_assert(!dm_check_devices(uts, num_devices)); return 0; } DM_TEST(dm_test_bus_children, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* Test our functions for accessing children */ -static int dm_test_bus_children_funcs(struct dm_test_state *dms) +static int dm_test_bus_children_funcs(struct unit_test_state *uts) { const void *blob = gd->fdt_blob; struct udevice *bus, *dev; @@ -173,7 +173,7 @@ static int dm_test_bus_children_funcs(struct dm_test_state *dms) DM_TEST(dm_test_bus_children_funcs, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* Test that we can iterate through children */ -static int dm_test_bus_children_iterators(struct dm_test_state *dms) +static int dm_test_bus_children_iterators(struct unit_test_state *uts) { struct udevice *bus, *dev, *child; @@ -204,7 +204,7 @@ DM_TEST(dm_test_bus_children_iterators, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* Test that the bus can store data about each child */ -static int test_bus_parent_data(struct dm_test_state *dms) +static int test_bus_parent_data(struct unit_test_state *uts) { struct dm_test_parent_data *parent_data; struct udevice *bus, *dev; @@ -264,14 +264,14 @@ static int test_bus_parent_data(struct dm_test_state *dms) return 0; } /* Test that the bus can store data about each child */ -static int dm_test_bus_parent_data(struct dm_test_state *dms) +static int dm_test_bus_parent_data(struct unit_test_state *uts) { - return test_bus_parent_data(dms); + return test_bus_parent_data(uts); } DM_TEST(dm_test_bus_parent_data, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* As above but the size is controlled by the uclass */ -static int dm_test_bus_parent_data_uclass(struct dm_test_state *dms) +static int dm_test_bus_parent_data_uclass(struct unit_test_state *uts) { struct driver *drv; struct udevice *bus; @@ -284,7 +284,7 @@ static int dm_test_bus_parent_data_uclass(struct dm_test_state *dms) size = drv->per_child_auto_alloc_size; bus->uclass->uc_drv->per_child_auto_alloc_size = size; drv->per_child_auto_alloc_size = 0; - ret = test_bus_parent_data(dms); + ret = test_bus_parent_data(uts); if (ret) return ret; bus->uclass->uc_drv->per_child_auto_alloc_size = 0; @@ -296,9 +296,10 @@ DM_TEST(dm_test_bus_parent_data_uclass, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* Test that the bus ops are called when a child is probed/removed */ -static int dm_test_bus_parent_ops(struct dm_test_state *dms) +static int dm_test_bus_parent_ops(struct unit_test_state *uts) { struct dm_test_parent_data *parent_data; + struct dm_test_state *dms = uts->priv; struct udevice *bus, *dev; struct uclass *uc; @@ -333,7 +334,7 @@ static int dm_test_bus_parent_ops(struct dm_test_state *dms) } DM_TEST(dm_test_bus_parent_ops, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); -static int test_bus_parent_platdata(struct dm_test_state *dms) +static int test_bus_parent_platdata(struct unit_test_state *uts) { struct dm_test_parent_platdata *plat; struct udevice *bus, *dev; @@ -406,14 +407,14 @@ static int test_bus_parent_platdata(struct dm_test_state *dms) } /* Test that the bus can store platform data about each child */ -static int dm_test_bus_parent_platdata(struct dm_test_state *dms) +static int dm_test_bus_parent_platdata(struct unit_test_state *uts) { - return test_bus_parent_platdata(dms); + return test_bus_parent_platdata(uts); } DM_TEST(dm_test_bus_parent_platdata, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* As above but the size is controlled by the uclass */ -static int dm_test_bus_parent_platdata_uclass(struct dm_test_state *dms) +static int dm_test_bus_parent_platdata_uclass(struct unit_test_state *uts) { struct udevice *bus; struct driver *drv; @@ -426,7 +427,7 @@ static int dm_test_bus_parent_platdata_uclass(struct dm_test_state *dms) size = drv->per_child_platdata_auto_alloc_size; bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = size; drv->per_child_platdata_auto_alloc_size = 0; - ret = test_bus_parent_platdata(dms); + ret = test_bus_parent_platdata(uts); if (ret) return ret; bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = 0; @@ -438,7 +439,7 @@ DM_TEST(dm_test_bus_parent_platdata_uclass, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* Test that the child post_bind method is called */ -static int dm_test_bus_child_post_bind(struct dm_test_state *dms) +static int dm_test_bus_child_post_bind(struct unit_test_state *uts) { struct dm_test_parent_platdata *plat; struct udevice *bus, *dev; @@ -461,7 +462,7 @@ static int dm_test_bus_child_post_bind(struct dm_test_state *dms) DM_TEST(dm_test_bus_child_post_bind, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); /* Test that the child post_bind method is called */ -static int dm_test_bus_child_post_bind_uclass(struct dm_test_state *dms) +static int dm_test_bus_child_post_bind_uclass(struct unit_test_state *uts) { struct dm_test_parent_platdata *plat; struct udevice *bus, *dev; @@ -488,7 +489,7 @@ DM_TEST(dm_test_bus_child_post_bind_uclass, * Test that the bus' uclass' child_pre_probe() is called before the * device's probe() method */ -static int dm_test_bus_child_pre_probe_uclass(struct dm_test_state *dms) +static int dm_test_bus_child_pre_probe_uclass(struct unit_test_state *uts) { struct udevice *bus, *dev; int child_count;