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 <sjg@chromium.org>

diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 39e47090a3a55c93aa26747e4a19b610cdae13a3..098b6f00ae3ccc2ac9526a48744197ba50783342 100644 (file)
--- 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 83f0f90831df83492bc6041b317df23fc769b814..4fbf20e275952f2833689054a92c70d22249dc53 100644 (file)
--- 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 ce5630fd3ee035e859f5d837c5f23ed7300c1e84..3267e50a313215e7b4aa145dc841e2c8589e0c55 100644 (file)
--- 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 344749bf608a4e2c2453059b32be9446a565ae21..e46c59b98eeb64120c61a8e664b07f8e7ae50a0e 100644 (file)
--- 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 6de9af9937e725491e7fcde1486afc63a64069e5..e2924105bd17926c7587e511b957fe811e0336b5 100644 (file)
--- 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 7267a89b30cc94574c42ef1eed70e7788eeb846c..4d2e730271f97cec637b1c748cd895ea60d134ad 100644 (file)
--- 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 cc640b311be11bf39102304ae5d9b7656795add2..ccc910e7c74f51073b6d8d93e5a43b04727a26cb 100644 (file)
--- 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 bba887c4fd000183c18f4c23347ed1735156dc40..0bba37779c848c93f08f0197cac28fca86a1e613 100644 (file)
--- 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 91158e5c6d3773d597379ea4dd943309aad8c497..396923ac78209eb682d20e3d97737bce1c0d60af 100644 (file)
--- 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 ef0fdf65e3110f45a55bfd309b173281540ce3ef..da11e9d2e12d4ec0e90ff741389760f7bb4954fb 100644 (file)
--- 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 0e83dc14d7df33c0439d30cf971e733007825318..9e81b1da1f07596111e909c52e6d0af5dd416b0f 100644 (file)
--- 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 378fc1e536afc6b924a03a38613154d6ae8d4ffd..3ab4a23649e77baa4f06dbd246c0efdf8067888b 100644 (file)
--- 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),
 };