aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dm/acpi.c2
-rw-r--r--test/dm/bus.c28
-rw-r--r--test/dm/core.c2
-rw-r--r--test/dm/mux-emul.c2
-rw-r--r--test/dm/regmap.c2
-rw-r--r--test/dm/test-driver.c4
-rw-r--r--test/dm/test-fdt.c14
-rw-r--r--test/dm/test-uclass.c6
8 files changed, 30 insertions, 30 deletions
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index f5eddac..d53f997 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -110,7 +110,7 @@ U_BOOT_DRIVER(testacpi_drv) = {
.of_match = testacpi_ids,
.id = UCLASS_TEST_ACPI,
.bind = dm_scan_fdt_dev,
- .platdata_auto_alloc_size = sizeof(struct testacpi_platdata),
+ .platdata_auto = sizeof(struct testacpi_platdata),
ACPI_OPS_PTR(&testacpi_ops)
};
diff --git a/test/dm/bus.c b/test/dm/bus.c
index 27b7266..c7ad63c 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -100,10 +100,10 @@ U_BOOT_DRIVER(testbus_drv) = {
.id = UCLASS_TEST_BUS,
.probe = testbus_drv_probe,
.child_post_bind = testbus_child_post_bind,
- .priv_auto_alloc_size = sizeof(struct dm_test_priv),
- .platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
- .per_child_auto_alloc_size = sizeof(struct dm_test_parent_data),
- .per_child_platdata_auto_alloc_size =
+ .priv_auto = sizeof(struct dm_test_priv),
+ .platdata_auto = sizeof(struct dm_test_pdata),
+ .per_child_auto = sizeof(struct dm_test_parent_data),
+ .per_child_platdata_auto =
sizeof(struct dm_test_parent_platdata),
.child_pre_probe = testbus_child_pre_probe,
.child_post_remove = testbus_child_post_remove,
@@ -312,19 +312,19 @@ static int dm_test_bus_parent_data_uclass(struct unit_test_state *uts)
/* Set the driver size to 0 so that the uclass size is used */
ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus));
drv = (struct driver *)bus->driver;
- size = drv->per_child_auto_alloc_size;
+ size = drv->per_child_auto;
#ifdef CONFIG_SANDBOX
os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv));
os_mprotect_allow(drv, sizeof(*drv));
#endif
- bus->uclass->uc_drv->per_child_auto_alloc_size = size;
- drv->per_child_auto_alloc_size = 0;
+ bus->uclass->uc_drv->per_child_auto = size;
+ drv->per_child_auto = 0;
ret = test_bus_parent_data(uts);
if (ret)
return ret;
- bus->uclass->uc_drv->per_child_auto_alloc_size = 0;
- drv->per_child_auto_alloc_size = size;
+ bus->uclass->uc_drv->per_child_auto = 0;
+ drv->per_child_auto = size;
return 0;
}
@@ -456,18 +456,18 @@ static int dm_test_bus_parent_platdata_uclass(struct unit_test_state *uts)
/* Set the driver size to 0 so that the uclass size is used */
ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus));
drv = (struct driver *)bus->driver;
- size = drv->per_child_platdata_auto_alloc_size;
+ size = drv->per_child_platdata_auto;
#ifdef CONFIG_SANDBOX
os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv));
os_mprotect_allow(drv, sizeof(*drv));
#endif
- bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = size;
- drv->per_child_platdata_auto_alloc_size = 0;
+ bus->uclass->uc_drv->per_child_platdata_auto = size;
+ drv->per_child_platdata_auto = 0;
ret = test_bus_parent_platdata(uts);
if (ret)
return ret;
- bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = 0;
- drv->per_child_platdata_auto_alloc_size = size;
+ bus->uclass->uc_drv->per_child_platdata_auto = 0;
+ drv->per_child_platdata_auto = size;
return 0;
}
diff --git a/test/dm/core.c b/test/dm/core.c
index 71ebb36..c3e8922 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -154,7 +154,7 @@ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts)
* Test if test uclass driver requires allocation for the uclass
* platform data and then check the dev->uclass_platdata pointer.
*/
- ut_assert(uc->uc_drv->per_device_platdata_auto_alloc_size);
+ ut_assert(uc->uc_drv->per_device_platdata_auto);
for (uclass_find_first_device(UCLASS_TEST, &dev);
dev;
diff --git a/test/dm/mux-emul.c b/test/dm/mux-emul.c
index 141fd4d..45154ce 100644
--- a/test/dm/mux-emul.c
+++ b/test/dm/mux-emul.c
@@ -60,7 +60,7 @@ U_BOOT_DRIVER(emul_mux) = {
.of_match = mux_emul_of_match,
.ops = &mux_emul_ops,
.probe = mux_emul_probe,
- .priv_auto_alloc_size = sizeof(struct mux_emul_priv),
+ .priv_auto = sizeof(struct mux_emul_priv),
};
static int dm_test_mux_emul_default_state(struct unit_test_state *uts)
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 2effef3..22a2930 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -280,7 +280,7 @@ U_BOOT_DRIVER(regmap_test) = {
.of_match = regmaptest_ids,
.id = UCLASS_NOP,
.probe = remaptest_probe,
- .priv_auto_alloc_size = sizeof(struct regmaptest_priv),
+ .priv_auto = sizeof(struct regmaptest_priv),
};
static int dm_test_devm_regmap(struct unit_test_state *uts)
diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c
index 08bdf01..5c074cd 100644
--- a/test/dm/test-driver.c
+++ b/test/dm/test-driver.c
@@ -81,7 +81,7 @@ U_BOOT_DRIVER(test_drv) = {
.probe = test_probe,
.remove = test_remove,
.unbind = test_unbind,
- .priv_auto_alloc_size = sizeof(struct dm_test_priv),
+ .priv_auto = sizeof(struct dm_test_priv),
};
U_BOOT_DRIVER(test2_drv) = {
@@ -92,7 +92,7 @@ U_BOOT_DRIVER(test2_drv) = {
.probe = test_probe,
.remove = test_remove,
.unbind = test_unbind,
- .priv_auto_alloc_size = sizeof(struct dm_test_priv),
+ .priv_auto = sizeof(struct dm_test_priv),
};
static int test_manual_drv_ping(struct udevice *dev, int pingval, int *pingret)
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 673ffb4..79f39d0 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -86,8 +86,8 @@ U_BOOT_DRIVER(testfdt_drv) = {
.ofdata_to_platdata = testfdt_ofdata_to_platdata,
.probe = testfdt_drv_probe,
.ops = &test_ops,
- .priv_auto_alloc_size = sizeof(struct dm_test_priv),
- .platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
+ .priv_auto = sizeof(struct dm_test_priv),
+ .platdata_auto = sizeof(struct dm_test_pdata),
};
static const struct udevice_id testfdt1_ids[] = {
@@ -104,8 +104,8 @@ U_BOOT_DRIVER(testfdt1_drv) = {
.ofdata_to_platdata = testfdt_ofdata_to_platdata,
.probe = testfdt_drv_probe,
.ops = &test_ops,
- .priv_auto_alloc_size = sizeof(struct dm_test_priv),
- .platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
+ .priv_auto = sizeof(struct dm_test_priv),
+ .platdata_auto = sizeof(struct dm_test_pdata),
.flags = DM_FLAG_PRE_RELOC,
};
@@ -147,7 +147,7 @@ U_BOOT_DRIVER(testprobe_drv) = {
.of_match = testprobe_ids,
.id = UCLASS_TEST_PROBE,
.probe = testprobe_drv_probe,
- .platdata_auto_alloc_size = sizeof(struct dm_testprobe_pdata),
+ .platdata_auto = sizeof(struct dm_testprobe_pdata),
};
UCLASS_DRIVER(testprobe) = {
@@ -204,8 +204,8 @@ U_BOOT_DRIVER(testdevres_drv) = {
.bind = testdevres_drv_bind,
.ofdata_to_platdata = testdevres_drv_ofdata_to_platdata,
.probe = testdevres_drv_probe,
- .platdata_auto_alloc_size = sizeof(struct dm_testdevres_pdata),
- .priv_auto_alloc_size = sizeof(struct dm_testdevres_priv),
+ .platdata_auto = sizeof(struct dm_testdevres_pdata),
+ .priv_auto = sizeof(struct dm_testdevres_priv),
};
UCLASS_DRIVER(testdevres) = {
diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c
index 760731b..94c2753 100644
--- a/test/dm/test-uclass.c
+++ b/test/dm/test-uclass.c
@@ -124,8 +124,8 @@ UCLASS_DRIVER(test) = {
.pre_remove = test_pre_remove,
.init = test_init,
.destroy = test_destroy,
- .priv_auto_alloc_size = sizeof(struct dm_test_uclass_priv),
- .per_device_auto_alloc_size = sizeof(struct dm_test_uclass_perdev_priv),
- .per_device_platdata_auto_alloc_size =
+ .priv_auto = sizeof(struct dm_test_uclass_priv),
+ .per_device_auto = sizeof(struct dm_test_uclass_perdev_priv),
+ .per_device_platdata_auto =
sizeof(struct dm_test_perdev_uc_pdata),
};
generated by cgit v1.1 at 2024-09-16 14:03:06 +0000