From b012ff1f1b0d662587dcf8707fe7cbf1c1f35d2f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Dec 2020 16:55:22 -0700 Subject: [PATCH] dm: treewide: Update 'auto' declarations to be on one line Fix up the code style for those declarations that should now fit onto one line, which is all of them that currently do not. This is needed for dtoc to detect the structs correctly, at present. Signed-off-by: Simon Glass --- arch/x86/cpu/intel_common/p2sb.c | 3 +-- drivers/i2c/i2c-emul-uclass.c | 3 +-- drivers/misc/p2sb-uclass.c | 3 +-- drivers/pci/pci-uclass.c | 3 +-- drivers/pci/pci_sandbox.c | 3 +-- drivers/power/regulator/regulator-uclass.c | 3 +-- drivers/remoteproc/rproc-uclass.c | 3 +-- drivers/spi/spi-uclass.c | 3 +-- drivers/usb/emul/sandbox_hub.c | 3 +-- drivers/video/nexell_display.c | 3 +-- test/dm/bus.c | 3 +-- test/dm/test-uclass.c | 3 +-- 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 39e47090a3..098b6f00ae 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -198,8 +198,7 @@ U_BOOT_DRIVER(intel_p2sb) = { .ops = &p2sb_ops, .of_to_plat = p2sb_of_to_plat, .plat_auto = sizeof(struct p2sb_platdata), - .per_child_plat_auto = - sizeof(struct p2sb_child_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_platdata), .child_post_bind = p2sb_child_post_bind, .flags = DM_FLAG_OS_PREPARE, }; diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 83f0f90831..4fbf20e275 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -64,8 +64,7 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) UCLASS_DRIVER(i2c_emul) = { .id = UCLASS_I2C_EMUL, .name = "i2c_emul", - .per_device_plat_auto = - sizeof(struct i2c_emul_uc_platdata), + .per_device_plat_auto = sizeof(struct i2c_emul_uc_platdata), }; /* diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index ce5630fd3e..3267e50a31 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -224,6 +224,5 @@ UCLASS_DRIVER(p2sb) = { .per_device_auto = sizeof(struct p2sb_uc_priv), .post_bind = p2sb_post_bind, .child_post_bind = p2sb_child_post_bind, - .per_child_plat_auto = - sizeof(struct p2sb_child_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_platdata), }; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 344749bf60..e46c59b98e 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1797,8 +1797,7 @@ UCLASS_DRIVER(pci) = { .post_probe = pci_uclass_post_probe, .child_post_bind = pci_uclass_child_post_bind, .per_device_auto = sizeof(struct pci_controller), - .per_child_plat_auto = - sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_platdata), }; static const struct dm_pci_ops pci_bridge_ops = { diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index 6de9af9937..e2924105bd 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -132,6 +132,5 @@ U_BOOT_DRIVER(pci_sandbox) = { /* Attach an emulator if we can */ .child_post_bind = dm_scan_fdt_dev, - .per_child_plat_auto = - sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_platdata), }; diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 7267a89b30..4d2e730271 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -500,6 +500,5 @@ UCLASS_DRIVER(regulator) = { .name = "regulator", .post_bind = regulator_post_bind, .pre_probe = regulator_pre_probe, - .per_device_plat_auto = - sizeof(struct dm_regulator_uclass_plat), + .per_device_plat_auto = sizeof(struct dm_regulator_uclass_plat), }; diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index cc640b311b..ccc910e7c7 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -210,8 +210,7 @@ UCLASS_DRIVER(rproc) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .pre_probe = rproc_pre_probe, .post_probe = rproc_post_probe, - .per_device_plat_auto = - sizeof(struct dm_rproc_uclass_pdata), + .per_device_plat_auto = sizeof(struct dm_rproc_uclass_pdata), }; /* Remoteproc subsystem access functions */ diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index bba887c4fd..0bba37779c 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -504,8 +504,7 @@ UCLASS_DRIVER(spi) = { .child_pre_probe = spi_child_pre_probe, .per_device_auto = sizeof(struct dm_spi_bus), .per_child_auto = sizeof(struct spi_slave), - .per_child_plat_auto = - sizeof(struct dm_spi_slave_platdata), + .per_child_plat_auto = sizeof(struct dm_spi_slave_platdata), #if !CONFIG_IS_ENABLED(OF_PLATDATA) .child_post_bind = spi_child_post_bind, #endif diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 91158e5c6d..396923ac78 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -329,7 +329,6 @@ U_BOOT_DRIVER(usb_sandbox_hub) = { .bind = sandbox_hub_bind, .ops = &sandbox_usb_hub_ops, .priv_auto = sizeof(struct sandbox_hub_priv), - .per_child_plat_auto = - sizeof(struct sandbox_hub_platdata), + .per_child_plat_auto = sizeof(struct sandbox_hub_platdata), .child_post_bind = sandbox_child_post_bind, }; diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index ef0fdf65e3..da11e9d2e1 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -643,8 +643,7 @@ U_BOOT_DRIVER(nexell_display) = { .name = "nexell-display", .id = UCLASS_VIDEO, .of_match = nx_display_ids, - .plat_auto = - sizeof(struct nx_display_platdata), + .plat_auto = sizeof(struct nx_display_platdata), .bind = nx_display_bind, .probe = nx_display_probe, .priv_auto = sizeof(struct nx_display_dev), diff --git a/test/dm/bus.c b/test/dm/bus.c index 0e83dc14d7..9e81b1da1f 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -103,8 +103,7 @@ U_BOOT_DRIVER(testbus_drv) = { .priv_auto = sizeof(struct dm_test_priv), .plat_auto = sizeof(struct dm_test_pdata), .per_child_auto = sizeof(struct dm_test_parent_data), - .per_child_plat_auto = - sizeof(struct dm_test_parent_plat), + .per_child_plat_auto = sizeof(struct dm_test_parent_plat), .child_pre_probe = testbus_child_pre_probe, .child_post_remove = testbus_child_post_remove, }; diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 378fc1e536..3ab4a23649 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -126,6 +126,5 @@ UCLASS_DRIVER(test) = { .destroy = test_destroy, .priv_auto = sizeof(struct dm_test_uclass_priv), .per_device_auto = sizeof(struct dm_test_uclass_perdev_priv), - .per_device_plat_auto = - sizeof(struct dm_test_perdev_uc_pdata), + .per_device_plat_auto = sizeof(struct dm_test_perdev_uc_pdata), }; -- 2.39.5