aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/emul
diff options
context:
space:
mode:
authorSimon Glass2020-12-03 16:55:17 -0700
committerSimon Glass2020-12-13 08:00:25 -0700
commit41575d8e4c334df148c4cdd7c40cc825dc0fcaa1 (patch)
treec27d9450fb5e72372be8483fc15079467b588169 /drivers/usb/emul
parent78128d52dfca9fff53770c7aed2e4673070c5978 (diff)
dm: treewide: Rename auto_alloc_size members to be shorter
This construct is quite long-winded. In earlier days it made some sense since auto-allocation was a strange concept. But with driver model now used pretty universally, we can shorten this to 'auto'. This reduces verbosity and makes it easier to read. Coincidentally it also ensures that every declaration is on one line, thus making dtoc's job easier. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/usb/emul')
-rw-r--r--drivers/usb/emul/sandbox_flash.c4
-rw-r--r--drivers/usb/emul/sandbox_hub.c4
-rw-r--r--drivers/usb/emul/sandbox_keyb.c4
-rw-r--r--drivers/usb/emul/usb-emul-uclass.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 9c305f46e94..d63dee41fcd 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -421,6 +421,6 @@ U_BOOT_DRIVER(usb_sandbox_flash) = {
.probe = sandbox_flash_probe,
.ofdata_to_platdata = sandbox_flash_ofdata_to_platdata,
.ops = &sandbox_usb_flash_ops,
- .priv_auto_alloc_size = sizeof(struct sandbox_flash_priv),
- .platdata_auto_alloc_size = sizeof(struct sandbox_flash_plat),
+ .priv_auto = sizeof(struct sandbox_flash_priv),
+ .platdata_auto = sizeof(struct sandbox_flash_plat),
};
diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c
index 21bf3bda48d..3e66ca46988 100644
--- a/drivers/usb/emul/sandbox_hub.c
+++ b/drivers/usb/emul/sandbox_hub.c
@@ -328,8 +328,8 @@ U_BOOT_DRIVER(usb_sandbox_hub) = {
.of_match = sandbox_usb_hub_ids,
.bind = sandbox_hub_bind,
.ops = &sandbox_usb_hub_ops,
- .priv_auto_alloc_size = sizeof(struct sandbox_hub_priv),
- .per_child_platdata_auto_alloc_size =
+ .priv_auto = sizeof(struct sandbox_hub_priv),
+ .per_child_platdata_auto =
sizeof(struct sandbox_hub_platdata),
.child_post_bind = sandbox_child_post_bind,
};
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index f562fb7eca2..c64ce1feeb5 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -241,6 +241,6 @@ U_BOOT_DRIVER(usb_sandbox_keyb) = {
.bind = sandbox_keyb_bind,
.probe = sandbox_keyb_probe,
.ops = &sandbox_usb_keyb_ops,
- .priv_auto_alloc_size = sizeof(struct sandbox_keyb_priv),
- .platdata_auto_alloc_size = sizeof(struct sandbox_keyb_plat),
+ .priv_auto = sizeof(struct sandbox_keyb_priv),
+ .platdata_auto = sizeof(struct sandbox_keyb_plat),
};
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index e3419e2fd47..b3069390429 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -298,7 +298,7 @@ UCLASS_DRIVER(usb_emul) = {
.id = UCLASS_USB_EMUL,
.name = "usb_emul",
.post_bind = dm_scan_fdt_dev,
- .per_device_platdata_auto_alloc_size = sizeof(struct usb_emul_platdata),
- .per_child_auto_alloc_size = sizeof(struct usb_device),
- .per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
+ .per_device_platdata_auto = sizeof(struct usb_emul_platdata),
+ .per_child_auto = sizeof(struct usb_device),
+ .per_child_platdata_auto = sizeof(struct usb_dev_platdata),
};