diff mbox series

[2/9] dm: treewide: Rename auto_alloc_size members to be shorter

Message ID 20201203235525.415251-2-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show
Series dm: treewide: Tidy up and adjust driver model naming | expand

Commit Message

Simon Glass Dec. 3, 2020, 11:55 p.m. UTC
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>
---

 arch/arm/mach-ipq40xx/clock-ipq4019.c         |  2 +-
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    |  2 +-
 arch/arm/mach-snapdragon/clock-snapdragon.c   |  2 +-
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  2 +-
 arch/arm/mach-stm32mp/bsec.c                  |  2 +-
 arch/arm/mach-stm32mp/pwr_regulator.c         |  2 +-
 arch/x86/cpu/acpi_gpe.c                       |  2 +-
 arch/x86/cpu/apollolake/hostbridge.c          |  2 +-
 arch/x86/cpu/apollolake/pmc.c                 |  2 +-
 arch/x86/cpu/apollolake/spl.c                 |  2 +-
 arch/x86/cpu/apollolake/uart.c                |  4 +--
 arch/x86/cpu/broadwell/cpu_full.c             |  2 +-
 arch/x86/cpu/broadwell/sata.c                 |  2 +-
 arch/x86/cpu/intel_common/itss.c              |  4 +--
 arch/x86/cpu/intel_common/p2sb.c              |  4 +--
 arch/x86/cpu/irq.c                            |  2 +-
 arch/x86/cpu/slimbootloader/serial.c          |  4 +--
 arch/x86/cpu/tangier/pinmux.c                 |  2 +-
 arch/x86/lib/pmu.c                            |  2 +-
 arch/x86/lib/scu.c                            |  2 +-
 board/renesas/ulcb/cpld.c                     |  2 +-
 common/usb_hub.c                              |  6 ++--
 common/usb_storage.c                          |  2 +-
 doc/driver-model/design.rst                   | 26 ++++++++---------
 doc/driver-model/ethernet.rst                 |  8 +++---
 doc/driver-model/of-plat.rst                  |  6 ++--
 doc/driver-model/spi-howto.rst                |  6 ++--
 doc/driver-model/usb-info.rst                 |  6 ++--
 doc/imx/clk/ccf.txt                           |  2 +-
 drivers/adc/adc-uclass.c                      |  2 +-
 drivers/adc/exynos-adc.c                      |  2 +-
 drivers/adc/meson-saradc.c                    |  2 +-
 drivers/adc/rockchip-saradc.c                 |  2 +-
 drivers/adc/sandbox.c                         |  2 +-
 drivers/adc/stm32-adc-core.c                  |  2 +-
 drivers/adc/stm32-adc.c                       |  2 +-
 drivers/ata/ahci-uclass.c                     |  2 +-
 drivers/ata/dwc_ahci.c                        |  2 +-
 drivers/ata/fsl_sata.c                        |  4 +--
 drivers/ata/mtk_ahci.c                        |  2 +-
 drivers/ata/sata_ceva.c                       |  2 +-
 drivers/ata/sata_mv.c                         |  2 +-
 drivers/ata/sata_sil.c                        |  4 +--
 drivers/axi/ihs_axi.c                         |  2 +-
 drivers/axi/sandbox_store.c                   |  2 +-
 drivers/block/blk-uclass.c                    |  2 +-
 drivers/block/sandbox.c                       |  2 +-
 drivers/bootcount/bootcount.c                 |  2 +-
 drivers/bootcount/i2c-eeprom.c                |  2 +-
 drivers/bootcount/rtc.c                       |  2 +-
 drivers/bootcount/spi-flash.c                 |  2 +-
 drivers/button/button-gpio.c                  |  2 +-
 drivers/button/button-uclass.c                |  2 +-
 drivers/cache/cache-v5l2.c                    |  2 +-
 drivers/clk/altera/clk-agilex.c               |  2 +-
 drivers/clk/altera/clk-arria10.c              |  2 +-
 drivers/clk/aspeed/clk_ast2500.c              |  2 +-
 drivers/clk/at91/compat.c                     | 22 +++++++--------
 drivers/clk/at91/sckc.c                       |  2 +-
 drivers/clk/clk-cdce9xx.c                     |  2 +-
 drivers/clk/clk-hsdk-cgu.c                    |  2 +-
 drivers/clk/clk-ti-sci.c                      |  2 +-
 drivers/clk/clk_bcm6345.c                     |  2 +-
 drivers/clk/clk_boston.c                      |  2 +-
 drivers/clk/clk_fixed_factor.c                |  2 +-
 drivers/clk/clk_fixed_rate.c                  |  2 +-
 drivers/clk/clk_octeon.c                      |  2 +-
 drivers/clk/clk_pic32.c                       |  2 +-
 drivers/clk/clk_sandbox.c                     |  2 +-
 drivers/clk/clk_sandbox_test.c                |  2 +-
 drivers/clk/clk_stm32f.c                      |  2 +-
 drivers/clk/clk_stm32h7.c                     |  2 +-
 drivers/clk/clk_stm32mp1.c                    |  2 +-
 drivers/clk/clk_versal.c                      |  2 +-
 drivers/clk/clk_vexpress_osc.c                |  2 +-
 drivers/clk/clk_zynq.c                        |  2 +-
 drivers/clk/clk_zynqmp.c                      |  2 +-
 drivers/clk/exynos/clk-exynos7420.c           |  4 +--
 drivers/clk/ics8n3qv01.c                      |  2 +-
 drivers/clk/mediatek/clk-mt7622.c             | 16 +++++------
 drivers/clk/mediatek/clk-mt7623.c             | 12 ++++----
 drivers/clk/mediatek/clk-mt7629.c             | 14 +++++-----
 drivers/clk/mediatek/clk-mt8512.c             |  8 +++---
 drivers/clk/mediatek/clk-mt8516.c             |  6 ++--
 drivers/clk/mediatek/clk-mt8518.c             |  6 ++--
 drivers/clk/meson/axg.c                       |  2 +-
 drivers/clk/meson/g12a.c                      |  2 +-
 drivers/clk/meson/gxbb.c                      |  2 +-
 drivers/clk/mpc83xx_clk.c                     |  2 +-
 drivers/clk/mtmips/clk-mt7628.c               |  2 +-
 drivers/clk/mvebu/armada-37xx-periph.c        |  2 +-
 drivers/clk/mvebu/armada-37xx-tbg.c           |  2 +-
 drivers/clk/owl/clk_owl.c                     |  2 +-
 drivers/clk/renesas/r8a774a1-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a774b1-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a774c0-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a774e1-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a7790-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7791-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7792-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7794-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7795-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7796-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a77965-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77970-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77980-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77990-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77995-cpg-mssr.c       |  2 +-
 drivers/clk/rockchip/clk_px30.c               |  4 +--
 drivers/clk/rockchip/clk_rk3036.c             |  2 +-
 drivers/clk/rockchip/clk_rk3128.c             |  2 +-
 drivers/clk/rockchip/clk_rk3188.c             |  4 +--
 drivers/clk/rockchip/clk_rk322x.c             |  2 +-
 drivers/clk/rockchip/clk_rk3288.c             |  4 +--
 drivers/clk/rockchip/clk_rk3308.c             |  2 +-
 drivers/clk/rockchip/clk_rk3328.c             |  2 +-
 drivers/clk/rockchip/clk_rk3368.c             |  4 +--
 drivers/clk/rockchip/clk_rk3399.c             |  8 +++---
 drivers/clk/rockchip/clk_rv1108.c             |  2 +-
 drivers/clk/sifive/fu540-prci.c               |  2 +-
 drivers/clk/sunxi/clk_a10.c                   |  2 +-
 drivers/clk/sunxi/clk_a10s.c                  |  2 +-
 drivers/clk/sunxi/clk_a23.c                   |  2 +-
 drivers/clk/sunxi/clk_a31.c                   |  2 +-
 drivers/clk/sunxi/clk_a64.c                   |  2 +-
 drivers/clk/sunxi/clk_a80.c                   |  2 +-
 drivers/clk/sunxi/clk_a83t.c                  |  2 +-
 drivers/clk/sunxi/clk_h3.c                    |  2 +-
 drivers/clk/sunxi/clk_h6.c                    |  2 +-
 drivers/clk/sunxi/clk_r40.c                   |  2 +-
 drivers/clk/sunxi/clk_v3s.c                   |  2 +-
 drivers/clk/uniphier/clk-uniphier-core.c      |  2 +-
 drivers/core/device-remove.c                  |  8 +++---
 drivers/core/device.c                         | 26 ++++++++---------
 drivers/core/simple-bus.c                     |  2 +-
 drivers/core/simple-pm-bus.c                  |  2 +-
 drivers/core/syscon-uclass.c                  |  2 +-
 drivers/core/uclass.c                         |  8 +++---
 drivers/cpu/at91_cpu.c                        |  2 +-
 drivers/cpu/bmips_cpu.c                       |  2 +-
 drivers/cpu/cpu-uclass.c                      |  2 +-
 drivers/cpu/imx8_cpu.c                        |  2 +-
 drivers/cpu/mpc83xx_cpu.c                     |  2 +-
 drivers/crypto/fsl/rng.c                      |  2 +-
 drivers/ddr/altera/sdram_gen5.c               |  4 +--
 drivers/ddr/altera/sdram_soc64.c              |  4 +--
 drivers/demo/demo-shape.c                     |  4 +--
 drivers/demo/demo-simple.c                    |  2 +-
 drivers/dma/bcm6348-iudma.c                   |  2 +-
 drivers/dma/dma-uclass.c                      |  2 +-
 drivers/dma/sandbox-dma-test.c                |  2 +-
 drivers/dma/ti-edma3.c                        |  2 +-
 drivers/dma/ti/k3-udma.c                      |  2 +-
 drivers/firmware/scmi/mailbox_agent.c         |  2 +-
 drivers/firmware/scmi/sandbox-scmi_agent.c    |  2 +-
 drivers/firmware/scmi/sandbox-scmi_devices.c  |  2 +-
 drivers/firmware/scmi/smccc_agent.c           |  2 +-
 drivers/firmware/ti_sci.c                     |  2 +-
 drivers/gpio/74x164_gpio.c                    |  2 +-
 drivers/gpio/altera_pio.c                     |  2 +-
 drivers/gpio/at91_gpio.c                      |  4 +--
 drivers/gpio/atmel_pio4.c                     |  2 +-
 drivers/gpio/bcm2835_gpio.c                   |  4 +--
 drivers/gpio/bcm6345_gpio.c                   |  2 +-
 drivers/gpio/cortina_gpio.c                   |  2 +-
 drivers/gpio/da8xx_gpio.c                     |  4 +--
 drivers/gpio/dwapb_gpio.c                     |  2 +-
 drivers/gpio/gpio-rcar.c                      |  2 +-
 drivers/gpio/gpio-rza1.c                      |  2 +-
 drivers/gpio/gpio-uclass.c                    |  6 ++--
 drivers/gpio/gpio-uniphier.c                  |  2 +-
 drivers/gpio/hi6220_gpio.c                    |  2 +-
 drivers/gpio/hsdk-creg-gpio.c                 |  2 +-
 drivers/gpio/imx_rgpio2p.c                    |  2 +-
 drivers/gpio/intel_broadwell_gpio.c           |  4 +--
 drivers/gpio/intel_ich6_gpio.c                |  4 +--
 drivers/gpio/iproc_gpio.c                     |  2 +-
 drivers/gpio/lpc32xx_gpio.c                   |  2 +-
 drivers/gpio/mpc83xx_spisel_boot.c            |  4 +--
 drivers/gpio/mpc8xxx_gpio.c                   |  4 +--
 drivers/gpio/mscc_sgpio.c                     |  2 +-
 drivers/gpio/msm_gpio.c                       |  2 +-
 drivers/gpio/mvebu_gpio.c                     |  2 +-
 drivers/gpio/mxc_gpio.c                       |  4 +--
 drivers/gpio/mxs_gpio.c                       |  4 +--
 drivers/gpio/nx_gpio.c                        |  2 +-
 drivers/gpio/octeon_gpio.c                    |  2 +-
 drivers/gpio/omap_gpio.c                      |  4 +--
 drivers/gpio/pca953x_gpio.c                   |  2 +-
 drivers/gpio/pcf8575_gpio.c                   |  2 +-
 drivers/gpio/pic32_gpio.c                     |  2 +-
 drivers/gpio/pm8916_gpio.c                    |  4 +--
 drivers/gpio/rk_gpio.c                        |  2 +-
 drivers/gpio/s5p_gpio.c                       |  2 +-
 drivers/gpio/sandbox.c                        |  2 +-
 drivers/gpio/sifive-gpio.c                    |  2 +-
 drivers/gpio/stm32_gpio.c                     |  2 +-
 drivers/gpio/tegra_gpio.c                     |  2 +-
 drivers/gpio/vybrid_gpio.c                    |  4 +--
 drivers/gpio/xilinx_gpio.c                    |  4 +--
 drivers/gpio/zynq_gpio.c                      |  2 +-
 drivers/hwspinlock/stm32_hwspinlock.c         |  2 +-
 drivers/i2c/ast_i2c.c                         |  2 +-
 drivers/i2c/at91_i2c.c                        |  4 +--
 drivers/i2c/cros_ec_tunnel.c                  |  2 +-
 drivers/i2c/davinci_i2c.c                     |  2 +-
 drivers/i2c/designware_i2c.c                  |  2 +-
 drivers/i2c/designware_i2c_pci.c              |  2 +-
 drivers/i2c/exynos_hs_i2c.c                   |  2 +-
 drivers/i2c/fsl_i2c.c                         |  2 +-
 drivers/i2c/i2c-cdns.c                        |  2 +-
 drivers/i2c/i2c-cortina.c                     |  2 +-
 drivers/i2c/i2c-emul-uclass.c                 |  4 +--
 drivers/i2c/i2c-gpio.c                        |  2 +-
 drivers/i2c/i2c-uclass.c                      |  8 +++---
 drivers/i2c/i2c-uniphier-f.c                  |  2 +-
 drivers/i2c/i2c-uniphier.c                    |  2 +-
 drivers/i2c/i2c-versatile.c                   |  2 +-
 drivers/i2c/ihs_i2c.c                         |  2 +-
 drivers/i2c/imx_lpi2c.c                       |  2 +-
 drivers/i2c/intel_i2c.c                       |  2 +-
 drivers/i2c/iproc_i2c.c                       |  2 +-
 drivers/i2c/meson_i2c.c                       |  2 +-
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c    |  2 +-
 drivers/i2c/muxes/i2c-mux-gpio.c              |  2 +-
 drivers/i2c/muxes/i2c-mux-uclass.c            |  4 +--
 drivers/i2c/muxes/pca954x.c                   |  2 +-
 drivers/i2c/mv_i2c.c                          |  2 +-
 drivers/i2c/mvtwsi.c                          |  2 +-
 drivers/i2c/mxc_i2c.c                         |  2 +-
 drivers/i2c/nx_i2c.c                          |  2 +-
 drivers/i2c/octeon_i2c.c                      |  2 +-
 drivers/i2c/omap24xx_i2c.c                    |  4 +--
 drivers/i2c/rcar_i2c.c                        |  2 +-
 drivers/i2c/rcar_iic.c                        |  2 +-
 drivers/i2c/rk_i2c.c                          |  2 +-
 drivers/i2c/s3c24x0_i2c.c                     |  2 +-
 drivers/i2c/sandbox_i2c.c                     |  2 +-
 drivers/i2c/stm32f7_i2c.c                     |  2 +-
 drivers/i2c/tegra186_bpmp_i2c.c               |  2 +-
 drivers/i2c/tegra_i2c.c                       |  2 +-
 drivers/i2c/xilinx_xiic.c                     |  2 +-
 drivers/input/cros_ec_keyb.c                  |  2 +-
 drivers/input/i8042.c                         |  2 +-
 drivers/input/keyboard-uclass.c               |  2 +-
 drivers/input/tegra-kbc.c                     |  2 +-
 drivers/led/led-uclass.c                      |  2 +-
 drivers/led/led_bcm6328.c                     |  2 +-
 drivers/led/led_bcm6358.c                     |  2 +-
 drivers/led/led_bcm6858.c                     |  2 +-
 drivers/led/led_cortina.c                     |  4 +--
 drivers/led/led_gpio.c                        |  2 +-
 drivers/mailbox/k3-sec-proxy.c                |  2 +-
 drivers/mailbox/sandbox-mbox-test.c           |  2 +-
 drivers/mailbox/sandbox-mbox.c                |  2 +-
 drivers/mailbox/stm32-ipcc.c                  |  2 +-
 drivers/mailbox/tegra-hsp.c                   |  2 +-
 drivers/mailbox/zynqmp-ipi.c                  |  2 +-
 drivers/memory/stm32-fmc2-ebi.c               |  2 +-
 drivers/misc/altera_sysid.c                   |  2 +-
 drivers/misc/atsha204a-i2c.c                  |  2 +-
 drivers/misc/cros_ec.c                        |  2 +-
 drivers/misc/cros_ec_sandbox.c                |  2 +-
 drivers/misc/fs_loader.c                      |  4 +--
 drivers/misc/gdsys_ioep.c                     |  2 +-
 drivers/misc/gdsys_rxaui_ctrl.c               |  2 +-
 drivers/misc/gdsys_soc.c                      |  2 +-
 drivers/misc/i2c_eeprom.c                     |  4 +--
 drivers/misc/i2c_eeprom_emul.c                |  4 +--
 drivers/misc/ihs_fpga.c                       |  2 +-
 drivers/misc/imx8/scu.c                       |  2 +-
 drivers/misc/irq_sandbox.c                    |  2 +-
 drivers/misc/k3_avs.c                         |  2 +-
 drivers/misc/microchip_flexcom.c              |  2 +-
 drivers/misc/misc_sandbox.c                   |  2 +-
 drivers/misc/mpc83xx_serdes.c                 |  2 +-
 drivers/misc/p2sb-uclass.c                    |  4 +--
 drivers/misc/p2sb_emul.c                      |  4 +--
 drivers/misc/p2sb_sandbox.c                   |  2 +-
 drivers/misc/rockchip-efuse.c                 |  2 +-
 drivers/misc/rockchip-otp.c                   |  2 +-
 drivers/misc/sandbox_adder.c                  |  2 +-
 drivers/misc/sifive-otp.c                     |  2 +-
 drivers/misc/swap_case.c                      |  4 +--
 drivers/misc/tegra186_bpmp.c                  |  2 +-
 drivers/mmc/am654_sdhci.c                     |  4 +--
 drivers/mmc/arm_pl180_mmci.c                  |  4 +--
 drivers/mmc/aspeed_sdhci.c                    |  4 +--
 drivers/mmc/atmel_sdhci.c                     |  4 +--
 drivers/mmc/bcm2835_sdhci.c                   |  4 +--
 drivers/mmc/bcm2835_sdhost.c                  |  4 +--
 drivers/mmc/bcmstb_sdhci.c                    |  4 +--
 drivers/mmc/ca_dw_mmc.c                       |  4 +--
 drivers/mmc/davinci_mmc.c                     |  4 +--
 drivers/mmc/exynos_dw_mmc.c                   |  4 +--
 drivers/mmc/fsl_esdhc.c                       |  4 +--
 drivers/mmc/fsl_esdhc_imx.c                   |  4 +--
 drivers/mmc/ftsdc010_mci.c                    |  4 +--
 drivers/mmc/gen_atmel_mci.c                   |  4 +--
 drivers/mmc/hi6220_dw_mmc.c                   |  4 +--
 drivers/mmc/iproc_sdhci.c                     |  4 +--
 drivers/mmc/jz_mmc.c                          |  4 +--
 drivers/mmc/meson_gx_mmc.c                    |  2 +-
 drivers/mmc/mmc-uclass.c                      |  2 +-
 drivers/mmc/mmc_spi.c                         |  4 +--
 drivers/mmc/msm_sdhci.c                       |  4 +--
 drivers/mmc/mtk-sd.c                          |  4 +--
 drivers/mmc/mv_sdhci.c                        |  4 +--
 drivers/mmc/mxsmmc.c                          |  4 +--
 drivers/mmc/nexell_dw_mmc.c                   |  4 +--
 drivers/mmc/octeontx_hsmmc.c                  |  2 +-
 drivers/mmc/omap_hsmmc.c                      |  4 +--
 drivers/mmc/pci_mmc.c                         |  4 +--
 drivers/mmc/pic32_sdhci.c                     |  4 +--
 drivers/mmc/pxa_mmc_gen.c                     |  2 +-
 drivers/mmc/renesas-sdhi.c                    |  4 +--
 drivers/mmc/rockchip_dw_mmc.c                 |  4 +--
 drivers/mmc/rockchip_sdhci.c                  |  4 +--
 drivers/mmc/s5p_sdhci.c                       |  4 +--
 drivers/mmc/sandbox_mmc.c                     |  2 +-
 drivers/mmc/sdhci-cadence.c                   |  4 +--
 drivers/mmc/sh_mmcif.c                        |  4 +--
 drivers/mmc/sh_sdhi.c                         |  4 +--
 drivers/mmc/snps_dw_mmc.c                     |  4 +--
 drivers/mmc/socfpga_dw_mmc.c                  |  4 +--
 drivers/mmc/sti_sdhci.c                       |  4 +--
 drivers/mmc/stm32_sdmmc2.c                    |  4 +--
 drivers/mmc/sunxi_mmc.c                       |  4 +--
 drivers/mmc/tangier_sdhci.c                   |  4 +--
 drivers/mmc/tegra_mmc.c                       |  4 +--
 drivers/mmc/uniphier-sd.c                     |  4 +--
 drivers/mmc/xenon_sdhci.c                     |  4 +--
 drivers/mmc/zynq_sdhci.c                      |  4 +--
 drivers/mtd/altera_qspi.c                     |  2 +-
 drivers/mtd/hbmc-am654.c                      |  2 +-
 drivers/mtd/mtd-uclass.c                      |  2 +-
 drivers/mtd/nand/raw/arasan_nfc.c             |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c  |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c  |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c  |  2 +-
 drivers/mtd/nand/raw/davinci_nand.c           |  2 +-
 drivers/mtd/nand/raw/denali_dt.c              |  2 +-
 drivers/mtd/nand/raw/mxs_nand_dt.c            |  2 +-
 drivers/mtd/nand/raw/octeontx_bch.c           |  4 +--
 drivers/mtd/nand/raw/octeontx_nand.c          |  2 +-
 drivers/mtd/nand/raw/pxa3xx_nand.c            |  2 +-
 drivers/mtd/nand/raw/stm32_fmc2_nand.c        |  2 +-
 drivers/mtd/nand/raw/tegra_nand.c             |  2 +-
 drivers/mtd/nand/raw/vf610_nfc.c              |  2 +-
 drivers/mtd/nand/raw/zynq_nand.c              |  2 +-
 drivers/mtd/nand/spi/core.c                   |  2 +-
 drivers/mtd/spi/sandbox.c                     |  4 +--
 drivers/mtd/spi/sf-uclass.c                   |  2 +-
 drivers/mtd/spi/sf_dataflash.c                |  2 +-
 drivers/mtd/spi/sf_probe.c                    |  2 +-
 drivers/mux/mux-uclass.c                      |  2 +-
 drivers/net/ag7xxx.c                          |  4 +--
 drivers/net/altera_tse.c                      |  4 +--
 drivers/net/bcm6348-eth.c                     |  4 +--
 drivers/net/bcm6368-eth.c                     |  4 +--
 drivers/net/bcmgenet.c                        |  4 +--
 drivers/net/dc2114x.c                         |  4 +--
 drivers/net/designware.c                      |  4 +--
 drivers/net/dwc_eth_qos.c                     |  4 +--
 drivers/net/dwmac_s700.c                      |  4 +--
 drivers/net/dwmac_socfpga.c                   |  4 +--
 drivers/net/e1000.c                           |  4 +--
 drivers/net/eepro100.c                        |  4 +--
 drivers/net/eth-phy-uclass.c                  |  2 +-
 drivers/net/ethoc.c                           |  4 +--
 drivers/net/fec_mxc.c                         |  4 +--
 drivers/net/fm/eth.c                          |  4 +--
 drivers/net/fm/fm.c                           |  2 +-
 drivers/net/fm/memac_phy.c                    |  4 +--
 drivers/net/fsl_enetc.c                       |  4 +--
 drivers/net/fsl_enetc_mdio.c                  |  2 +-
 drivers/net/fsl_ls_mdio.c                     |  2 +-
 drivers/net/fsl_mcdmafec.c                    |  4 +--
 drivers/net/fsl_mdio.c                        |  4 +--
 drivers/net/ftgmac100.c                       |  4 +--
 drivers/net/ftmac100.c                        |  4 +--
 drivers/net/gmac_rockchip.c                   |  4 +--
 drivers/net/higmacv300.c                      |  4 +--
 drivers/net/ks8851_mll.c                      |  4 +--
 drivers/net/ldpaa_eth/ldpaa_eth.c             |  4 +--
 drivers/net/macb.c                            |  4 +--
 drivers/net/mcffec.c                          |  4 +--
 drivers/net/mdio-ipq4019.c                    |  2 +-
 drivers/net/mdio_mux_i2creg.c                 |  2 +-
 drivers/net/mdio_mux_sandbox.c                |  2 +-
 drivers/net/mdio_sandbox.c                    |  2 +-
 drivers/net/mscc_eswitch/jr2_switch.c         |  4 +--
 drivers/net/mscc_eswitch/luton_switch.c       |  4 +--
 drivers/net/mscc_eswitch/ocelot_switch.c      |  4 +--
 drivers/net/mscc_eswitch/serval_switch.c      |  4 +--
 drivers/net/mscc_eswitch/servalt_switch.c     |  4 +--
 drivers/net/mt7628-eth.c                      |  4 +--
 drivers/net/mtk_eth.c                         |  4 +--
 drivers/net/mvgbe.c                           |  4 +--
 drivers/net/mvmdio.c                          |  2 +-
 drivers/net/mvneta.c                          |  4 +--
 drivers/net/mvpp2.c                           |  6 ++--
 drivers/net/octeontx/bgx.c                    |  2 +-
 drivers/net/octeontx/nic_main.c               |  2 +-
 drivers/net/octeontx/nicvf_main.c             |  4 +--
 drivers/net/octeontx2/cgx.c                   |  2 +-
 drivers/net/octeontx2/rvu_af.c                |  2 +-
 drivers/net/octeontx2/rvu_pf.c                |  4 +--
 drivers/net/pch_gbe.c                         |  4 +--
 drivers/net/pcnet.c                           |  4 +--
 drivers/net/pfe_eth/pfe_eth.c                 |  4 +--
 drivers/net/pic32_eth.c                       |  4 +--
 drivers/net/qe/dm_qe_uec.c                    |  4 +--
 drivers/net/qe/dm_qe_uec_phy.c                |  2 +-
 drivers/net/ravb.c                            |  4 +--
 drivers/net/rtl8139.c                         |  4 +--
 drivers/net/rtl8169.c                         |  4 +--
 drivers/net/sandbox-raw.c                     |  4 +--
 drivers/net/sandbox.c                         |  4 +--
 drivers/net/sh_eth.c                          |  4 +--
 drivers/net/smc911x.c                         |  4 +--
 drivers/net/sni_ave.c                         |  4 +--
 drivers/net/sun8i_emac.c                      |  4 +--
 drivers/net/sunxi_emac.c                      |  4 +--
 drivers/net/ti/am65-cpsw-nuss.c               |  4 +--
 drivers/net/ti/cpsw.c                         |  4 +--
 drivers/net/ti/davinci_emac.c                 |  2 +-
 drivers/net/ti/keystone_net.c                 |  8 +++---
 drivers/net/tsec.c                            |  4 +--
 drivers/net/xilinx_axi_emac.c                 |  4 +--
 drivers/net/xilinx_emaclite.c                 |  4 +--
 drivers/net/zynq_gem.c                        |  4 +--
 drivers/nvme/nvme.c                           |  4 +--
 drivers/pch/sandbox_pch.c                     |  2 +-
 drivers/pci/pci-aardvark.c                    |  2 +-
 drivers/pci/pci-emul-uclass.c                 |  6 ++--
 drivers/pci/pci-rcar-gen2.c                   |  2 +-
 drivers/pci/pci-rcar-gen3.c                   |  2 +-
 drivers/pci/pci-uclass.c                      |  4 +--
 drivers/pci/pci_mpc85xx.c                     |  2 +-
 drivers/pci/pci_mvebu.c                       |  2 +-
 drivers/pci/pci_octeontx.c                    |  2 +-
 drivers/pci/pci_sandbox.c                     |  4 +--
 drivers/pci/pci_tegra.c                       |  2 +-
 drivers/pci/pcie_brcmstb.c                    |  2 +-
 drivers/pci/pcie_dw_mvebu.c                   |  2 +-
 drivers/pci/pcie_dw_ti.c                      |  2 +-
 drivers/pci/pcie_ecam_generic.c               |  2 +-
 drivers/pci/pcie_fsl.c                        |  2 +-
 drivers/pci/pcie_imx.c                        |  2 +-
 drivers/pci/pcie_intel_fpga.c                 |  2 +-
 drivers/pci/pcie_iproc.c                      |  2 +-
 drivers/pci/pcie_layerscape_ep.c              |  2 +-
 drivers/pci/pcie_layerscape_gen4.c            |  2 +-
 drivers/pci/pcie_layerscape_rc.c              |  2 +-
 drivers/pci/pcie_mediatek.c                   |  4 +--
 drivers/pci/pcie_phytium.c                    |  2 +-
 drivers/pci/pcie_rockchip.c                   |  2 +-
 drivers/pci/pcie_xilinx.c                     |  2 +-
 drivers/pci_endpoint/pcie-cadence-ep.c        |  2 +-
 drivers/pci_endpoint/sandbox-pci_ep.c         |  2 +-
 drivers/phy/allwinner/phy-sun4i-usb.c         |  4 +--
 drivers/phy/bcm6318-usbh-phy.c                |  2 +-
 drivers/phy/bcm6348-usbh-phy.c                |  2 +-
 drivers/phy/bcm6358-usbh-phy.c                |  2 +-
 drivers/phy/bcm6368-usbh-phy.c                |  2 +-
 drivers/phy/keystone-usb-phy.c                |  2 +-
 drivers/phy/marvell/comphy_core.c             |  2 +-
 drivers/phy/meson-g12a-usb2.c                 |  2 +-
 drivers/phy/meson-g12a-usb3-pcie.c            |  2 +-
 drivers/phy/meson-gxbb-usb2.c                 |  2 +-
 drivers/phy/meson-gxl-usb2.c                  |  2 +-
 drivers/phy/msm8916-usbh-phy.c                |  2 +-
 drivers/phy/mt76x8-usb-phy.c                  |  2 +-
 drivers/phy/nop-phy.c                         |  2 +-
 drivers/phy/omap-usb2-phy.c                   |  2 +-
 drivers/phy/phy-bcm-sr-pcie.c                 |  4 +--
 drivers/phy/phy-mtk-tphy.c                    |  2 +-
 drivers/phy/phy-qcom-ipq4019-usb.c            |  4 +--
 drivers/phy/phy-rcar-gen2.c                   |  2 +-
 drivers/phy/phy-rcar-gen3.c                   |  2 +-
 drivers/phy/phy-stm32-usbphyc.c               |  2 +-
 drivers/phy/phy-ti-am654.c                    |  4 +--
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c |  2 +-
 drivers/phy/rockchip/phy-rockchip-pcie.c      |  2 +-
 drivers/phy/rockchip/phy-rockchip-typec.c     |  2 +-
 drivers/phy/sandbox-phy.c                     |  2 +-
 drivers/phy/sti_usb_phy.c                     |  2 +-
 drivers/phy/ti-pipe3-phy.c                    |  2 +-
 drivers/pinctrl/aspeed/pinctrl_ast2500.c      |  2 +-
 drivers/pinctrl/ath79/pinctrl_ar933x.c        |  2 +-
 drivers/pinctrl/ath79/pinctrl_qca953x.c       |  2 +-
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c    |  2 +-
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c    |  2 +-
 drivers/pinctrl/exynos/pinctrl-exynos7420.c   |  2 +-
 drivers/pinctrl/intel/pinctrl_apl.c           |  4 +--
 drivers/pinctrl/mediatek/pinctrl-mt7622.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt7623.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt7629.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8512.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8516.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8518.c     |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-axg.c     |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-g12a.c    |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c    |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-gxl.c     |  2 +-
 drivers/pinctrl/mscc/pinctrl-jr2.c            |  2 +-
 drivers/pinctrl/mscc/pinctrl-luton.c          |  2 +-
 drivers/pinctrl/mscc/pinctrl-ocelot.c         |  2 +-
 drivers/pinctrl/mscc/pinctrl-serval.c         |  2 +-
 drivers/pinctrl/mscc/pinctrl-servalt.c        |  2 +-
 drivers/pinctrl/mtmips/pinctrl-mt7628.c       |  2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c   |  2 +-
 drivers/pinctrl/mvebu/pinctrl-mvebu.c         |  2 +-
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c      |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx5.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx6.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx7.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c         |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx8.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx8m.c           |  2 +-
 drivers/pinctrl/nxp/pinctrl-imxrt.c           |  2 +-
 drivers/pinctrl/nxp/pinctrl-mxs.c             |  2 +-
 drivers/pinctrl/nxp/pinctrl-vf610.c           |  2 +-
 drivers/pinctrl/pinctrl-at91-pio4.c           |  2 +-
 drivers/pinctrl/pinctrl-at91.c                |  2 +-
 drivers/pinctrl/pinctrl-kendryte.c            |  2 +-
 drivers/pinctrl/pinctrl-qe-io.c               |  2 +-
 drivers/pinctrl/pinctrl-sandbox.c             |  2 +-
 drivers/pinctrl/pinctrl-single.c              |  2 +-
 drivers/pinctrl/pinctrl-sti.c                 |  2 +-
 drivers/pinctrl/pinctrl-stmfx.c               |  2 +-
 drivers/pinctrl/pinctrl_pic32.c               |  2 +-
 drivers/pinctrl/pinctrl_stm32.c               |  2 +-
 drivers/pinctrl/renesas/pfc-r7s72100.c        |  2 +-
 drivers/pinctrl/renesas/pfc.c                 |  2 +-
 drivers/pinctrl/rockchip/pinctrl-px30.c       |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3036.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3128.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3188.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk322x.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3288.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3308.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3328.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3368.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3399.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rv1108.c     |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld11.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld20.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld4.c   |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld6b.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pro4.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pro5.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pxs2.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pxs3.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-sld8.c  |  2 +-
 drivers/power/acpi_pmc/acpi-pmc-uclass.c      |  2 +-
 drivers/power/acpi_pmc/pmc_emul.c             |  4 +--
 drivers/power/acpi_pmc/sandbox.c              |  2 +-
 drivers/power/domain/bcm6328-power-domain.c   |  2 +-
 .../power/domain/imx8-power-domain-legacy.c   |  4 +--
 drivers/power/domain/imx8m-power-domain.c     |  2 +-
 drivers/power/domain/meson-ee-pwrc.c          |  2 +-
 drivers/power/domain/meson-gx-pwrc-vpu.c      |  2 +-
 drivers/power/domain/mtk-power-domain.c       |  2 +-
 .../power/domain/sandbox-power-domain-test.c  |  2 +-
 drivers/power/domain/sandbox-power-domain.c   |  2 +-
 drivers/power/domain/ti-sci-power-domain.c    |  2 +-
 drivers/power/pmic/i2c_pmic_emul.c            |  2 +-
 drivers/power/pmic/pm8916.c                   |  2 +-
 drivers/power/pmic/pmic-uclass.c              |  2 +-
 drivers/power/pmic/rk8xx.c                    |  2 +-
 drivers/power/regulator/bd71837.c             |  2 +-
 drivers/power/regulator/da9063.c              |  4 +--
 drivers/power/regulator/fan53555.c            |  4 +--
 drivers/power/regulator/fixed.c               |  2 +-
 drivers/power/regulator/gpio-regulator.c      |  2 +-
 drivers/power/regulator/pbias_regulator.c     |  2 +-
 drivers/power/regulator/pfuze100.c            |  2 +-
 drivers/power/regulator/pwm_regulator.c       |  2 +-
 drivers/power/regulator/regulator-uclass.c    |  2 +-
 drivers/power/regulator/stm32-vrefbuf.c       |  2 +-
 drivers/power/regulator/tps62360_regulator.c  |  2 +-
 drivers/power/regulator/tps65910_regulator.c  |  6 ++--
 drivers/pwm/exynos_pwm.c                      |  2 +-
 drivers/pwm/pwm-imx.c                         |  2 +-
 drivers/pwm/pwm-meson.c                       |  2 +-
 drivers/pwm/pwm-mtk.c                         |  2 +-
 drivers/pwm/pwm-sifive.c                      |  2 +-
 drivers/pwm/rk_pwm.c                          |  2 +-
 drivers/pwm/sandbox_pwm.c                     |  2 +-
 drivers/pwm/sunxi_pwm.c                       |  2 +-
 drivers/pwm/tegra_pwm.c                       |  2 +-
 drivers/ram/aspeed/sdram_ast2500.c            |  2 +-
 drivers/ram/bmips_ram.c                       |  2 +-
 drivers/ram/imxrt_sdram.c                     |  2 +-
 drivers/ram/k3-am654-ddrss.c                  |  2 +-
 drivers/ram/k3-j721e/k3-j721e-ddrss.c         |  2 +-
 drivers/ram/mediatek/ddr3-mt7629.c            |  2 +-
 drivers/ram/mpc83xx_sdram.c                   |  2 +-
 drivers/ram/octeon/octeon_ddr.c               |  2 +-
 drivers/ram/rockchip/dmc-rk3368.c             |  6 ++--
 drivers/ram/rockchip/sdram_px30.c             |  2 +-
 drivers/ram/rockchip/sdram_rk3128.c           |  2 +-
 drivers/ram/rockchip/sdram_rk3188.c           |  4 +--
 drivers/ram/rockchip/sdram_rk322x.c           |  4 +--
 drivers/ram/rockchip/sdram_rk3288.c           |  4 +--
 drivers/ram/rockchip/sdram_rk3308.c           |  2 +-
 drivers/ram/rockchip/sdram_rk3328.c           |  4 +--
 drivers/ram/rockchip/sdram_rk3399.c           |  4 +--
 drivers/ram/sifive/fu540_ddr.c                |  4 +--
 drivers/ram/stm32_sdram.c                     |  2 +-
 drivers/ram/stm32mp1/stm32mp1_ram.c           |  2 +-
 drivers/remoteproc/k3_system_controller.c     |  2 +-
 drivers/remoteproc/rproc-uclass.c             |  2 +-
 drivers/remoteproc/sandbox_testproc.c         |  2 +-
 drivers/remoteproc/stm32_copro.c              |  2 +-
 drivers/remoteproc/ti_k3_arm64_rproc.c        |  2 +-
 drivers/remoteproc/ti_k3_dsp_rproc.c          |  2 +-
 drivers/remoteproc/ti_k3_r5f_rproc.c          |  4 +--
 drivers/remoteproc/ti_power_proc.c            |  2 +-
 drivers/reset/reset-ast2500.c                 |  2 +-
 drivers/reset/reset-bcm6345.c                 |  2 +-
 drivers/reset/reset-hisilicon.c               |  2 +-
 drivers/reset/reset-hsdk.c                    |  2 +-
 drivers/reset/reset-imx7.c                    |  2 +-
 drivers/reset/reset-ipq4019.c                 |  2 +-
 drivers/reset/reset-mediatek.c                |  2 +-
 drivers/reset/reset-meson.c                   |  2 +-
 drivers/reset/reset-mtmips.c                  |  2 +-
 drivers/reset/reset-rockchip.c                |  2 +-
 drivers/reset/reset-sifive.c                  |  2 +-
 drivers/reset/reset-socfpga.c                 |  2 +-
 drivers/reset/reset-sunxi.c                   |  2 +-
 drivers/reset/reset-syscon.c                  |  2 +-
 drivers/reset/reset-ti-sci.c                  |  2 +-
 drivers/reset/reset-uniphier.c                |  2 +-
 drivers/reset/sandbox-reset-test.c            |  2 +-
 drivers/reset/sandbox-reset.c                 |  2 +-
 drivers/reset/sti-reset.c                     |  2 +-
 drivers/reset/stm32-reset.c                   |  2 +-
 drivers/rng/meson-rng.c                       |  2 +-
 drivers/rng/msm_rng.c                         |  2 +-
 drivers/rng/rockchip_rng.c                    |  2 +-
 drivers/rng/stm32mp1_rng.c                    |  2 +-
 drivers/rtc/ds3232.c                          |  2 +-
 drivers/rtc/emul_rtc.c                        |  2 +-
 drivers/rtc/i2c_rtc_emul.c                    |  4 +--
 drivers/rtc/pl031.c                           |  2 +-
 drivers/rtc/stm32_rtc.c                       |  2 +-
 drivers/scsi/scsi-uclass.c                    |  2 +-
 drivers/serial/altera_jtag_uart.c             |  2 +-
 drivers/serial/altera_uart.c                  |  2 +-
 drivers/serial/atmel_usart.c                  |  4 +--
 drivers/serial/lpc32xx_hsuart.c               |  2 +-
 drivers/serial/ns16550.c                      |  4 +--
 drivers/serial/sandbox.c                      |  4 +--
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial_ar933x.c                |  2 +-
 drivers/serial/serial_arc.c                   |  2 +-
 drivers/serial/serial_bcm283x_mu.c            |  4 +--
 drivers/serial/serial_bcm283x_pl011.c         |  4 +--
 drivers/serial/serial_bcm6345.c               |  2 +-
 drivers/serial/serial_coreboot.c              |  4 +--
 drivers/serial/serial_cortina.c               |  2 +-
 drivers/serial/serial_efi.c                   |  2 +-
 drivers/serial/serial_intel_mid.c             |  4 +--
 drivers/serial/serial_linflexuart.c           |  2 +-
 drivers/serial/serial_lpuart.c                |  2 +-
 drivers/serial/serial_mcf.c                   |  2 +-
 drivers/serial/serial_meson.c                 |  2 +-
 drivers/serial/serial_msm.c                   |  2 +-
 drivers/serial/serial_mtk.c                   |  2 +-
 drivers/serial/serial_mvebu_a3700.c           |  2 +-
 drivers/serial/serial_mxc.c                   |  2 +-
 drivers/serial/serial_omap.c                  |  4 +--
 drivers/serial/serial_owl.c                   |  2 +-
 drivers/serial/serial_pic32.c                 |  2 +-
 drivers/serial/serial_pl01x.c                 |  4 +--
 drivers/serial/serial_rockchip.c              |  8 +++---
 drivers/serial/serial_s5p.c                   |  2 +-
 drivers/serial/serial_sh.c                    |  4 +--
 drivers/serial/serial_sifive.c                |  2 +-
 drivers/serial/serial_sti_asc.c               |  2 +-
 drivers/serial/serial_stm32.c                 |  2 +-
 drivers/serial/serial_uniphier.c              |  2 +-
 drivers/serial/serial_xen.c                   |  2 +-
 drivers/serial/serial_xuartlite.c             |  2 +-
 drivers/serial/serial_zynq.c                  |  2 +-
 drivers/soc/soc_ti_k3.c                       |  2 +-
 drivers/soc/ti/k3-navss-ringacc.c             |  2 +-
 drivers/sound/broadwell_i2s.c                 |  2 +-
 drivers/sound/hda_codec.c                     |  2 +-
 drivers/sound/i2s-uclass.c                    |  2 +-
 drivers/sound/ivybridge_sound.c               |  2 +-
 drivers/sound/max98088.c                      |  2 +-
 drivers/sound/max98090.c                      |  2 +-
 drivers/sound/max98095.c                      |  2 +-
 drivers/sound/rt5677.c                        |  2 +-
 drivers/sound/sandbox.c                       |  6 ++--
 drivers/sound/sound-uclass.c                  |  2 +-
 drivers/sound/tegra_ahub.c                    |  2 +-
 drivers/sound/wm8994.c                        |  2 +-
 drivers/spi/altera_spi.c                      |  4 +--
 drivers/spi/atcspi200_spi.c                   |  2 +-
 drivers/spi/ath79_spi.c                       |  2 +-
 drivers/spi/atmel-quadspi.c                   |  2 +-
 drivers/spi/atmel_spi.c                       |  4 +--
 drivers/spi/bcm63xx_hsspi.c                   |  2 +-
 drivers/spi/bcm63xx_spi.c                     |  2 +-
 drivers/spi/bcmstb_spi.c                      |  4 +--
 drivers/spi/cadence_qspi.c                    |  4 +--
 drivers/spi/cf_spi.c                          |  4 +--
 drivers/spi/davinci_spi.c                     |  4 +--
 drivers/spi/designware_spi.c                  |  4 +--
 drivers/spi/exynos_spi.c                      |  4 +--
 drivers/spi/fsl_dspi.c                        |  4 +--
 drivers/spi/fsl_espi.c                        |  4 +--
 drivers/spi/fsl_qspi.c                        |  2 +-
 drivers/spi/ich.c                             |  4 +--
 drivers/spi/kirkwood_spi.c                    |  4 +--
 drivers/spi/meson_spifc.c                     |  2 +-
 drivers/spi/mpc8xxx_spi.c                     |  2 +-
 drivers/spi/mscc_bb_spi.c                     |  2 +-
 drivers/spi/mt7621_spi.c                      |  2 +-
 drivers/spi/mtk_snfi_spi.c                    |  2 +-
 drivers/spi/mvebu_a3700_spi.c                 |  2 +-
 drivers/spi/mxc_spi.c                         |  2 +-
 drivers/spi/mxs_spi.c                         |  4 +--
 drivers/spi/nxp_fspi.c                        |  2 +-
 drivers/spi/octeon_spi.c                      |  2 +-
 drivers/spi/omap3_spi.c                       |  4 +--
 drivers/spi/pic32_spi.c                       |  2 +-
 drivers/spi/pl022_spi.c                       |  4 +--
 drivers/spi/renesas_rpc_spi.c                 |  4 +--
 drivers/spi/rk_spi.c                          |  4 +--
 drivers/spi/sh_qspi.c                         |  2 +-
 drivers/spi/soft_spi.c                        |  4 +--
 drivers/spi/spi-qup.c                         |  2 +-
 drivers/spi/spi-sifive.c                      |  2 +-
 drivers/spi/spi-sunxi.c                       |  4 +--
 drivers/spi/spi-uclass.c                      |  6 ++--
 drivers/spi/stm32_qspi.c                      |  2 +-
 drivers/spi/stm32_spi.c                       |  2 +-
 drivers/spi/tegra114_spi.c                    |  4 +--
 drivers/spi/tegra20_sflash.c                  |  4 +--
 drivers/spi/tegra20_slink.c                   |  4 +--
 drivers/spi/tegra210_qspi.c                   |  6 ++--
 drivers/spi/ti_qspi.c                         |  2 +-
 drivers/spi/uniphier_spi.c                    |  4 +--
 drivers/spi/xilinx_spi.c                      |  2 +-
 drivers/spi/zynq_qspi.c                       |  4 +--
 drivers/spi/zynq_spi.c                        |  4 +--
 drivers/spi/zynqmp_gqspi.c                    |  4 +--
 drivers/spmi/spmi-msm.c                       |  2 +-
 drivers/spmi/spmi-sandbox.c                   |  2 +-
 drivers/sysinfo/gazerbeam.c                   |  2 +-
 drivers/sysinfo/sandbox.c                     |  2 +-
 drivers/sysreset/poweroff_gpio.c              |  2 +-
 drivers/sysreset/sysreset-ti-sci.c            |  2 +-
 drivers/sysreset/sysreset_gpio.c              |  2 +-
 drivers/sysreset/sysreset_octeon.c            |  2 +-
 drivers/sysreset/sysreset_resetctl.c          |  2 +-
 drivers/sysreset/sysreset_socfpga.c           |  2 +-
 drivers/sysreset/sysreset_sti.c               |  2 +-
 drivers/sysreset/sysreset_syscon.c            |  2 +-
 drivers/sysreset/sysreset_watchdog.c          |  2 +-
 drivers/sysreset/sysreset_x86.c               |  2 +-
 drivers/tee/optee/core.c                      |  4 +--
 drivers/tee/sandbox.c                         |  2 +-
 drivers/tee/tee-uclass.c                      |  2 +-
 drivers/thermal/imx_scu_thermal.c             |  2 +-
 drivers/thermal/imx_thermal.c                 |  2 +-
 drivers/thermal/imx_tmu.c                     |  2 +-
 drivers/thermal/ti-bandgap.c                  |  2 +-
 drivers/timer/ag101p_timer.c                  |  2 +-
 drivers/timer/altera_timer.c                  |  2 +-
 drivers/timer/arc_timer.c                     |  2 +-
 drivers/timer/ast_timer.c                     |  2 +-
 drivers/timer/atcpit100_timer.c               |  2 +-
 drivers/timer/atmel_pit_timer.c               |  2 +-
 drivers/timer/cadence-ttc.c                   |  2 +-
 drivers/timer/dw-apb-timer.c                  |  2 +-
 drivers/timer/mchp-pit64b-timer.c             |  2 +-
 drivers/timer/mpc83xx_timer.c                 |  2 +-
 drivers/timer/mtk_timer.c                     |  2 +-
 drivers/timer/nomadik-mtu-timer.c             |  2 +-
 drivers/timer/omap-timer.c                    |  2 +-
 drivers/timer/ostm_timer.c                    |  2 +-
 drivers/timer/rockchip_timer.c                |  4 +--
 drivers/timer/sti-timer.c                     |  2 +-
 drivers/timer/stm32_timer.c                   |  2 +-
 drivers/timer/timer-uclass.c                  |  2 +-
 drivers/tpm/cr50_i2c.c                        |  2 +-
 drivers/tpm/tpm-uclass.c                      |  2 +-
 drivers/tpm/tpm2_ftpm_tee.c                   |  2 +-
 drivers/tpm/tpm2_tis_sandbox.c                |  2 +-
 drivers/tpm/tpm2_tis_spi.c                    |  2 +-
 drivers/tpm/tpm_tis_infineon.c                |  2 +-
 drivers/tpm/tpm_tis_lpc.c                     |  2 +-
 drivers/tpm/tpm_tis_sandbox.c                 |  2 +-
 drivers/tpm/tpm_tis_st33zp24_i2c.c            |  2 +-
 drivers/tpm/tpm_tis_st33zp24_spi.c            |  4 +--
 drivers/ufs/ufs-uclass.c                      |  2 +-
 drivers/usb/cdns3/cdns3-ti.c                  |  2 +-
 drivers/usb/cdns3/core.c                      |  4 +--
 drivers/usb/dwc3/dwc3-generic.c               | 10 +++----
 drivers/usb/dwc3/dwc3-meson-g12a.c            |  2 +-
 drivers/usb/dwc3/dwc3-meson-gxl.c             |  2 +-
 drivers/usb/emul/sandbox_flash.c              |  4 +--
 drivers/usb/emul/sandbox_hub.c                |  4 +--
 drivers/usb/emul/sandbox_keyb.c               |  4 +--
 drivers/usb/emul/usb-emul-uclass.c            |  6 ++--
 drivers/usb/eth/asix.c                        |  4 +--
 drivers/usb/eth/asix88179.c                   |  4 +--
 drivers/usb/eth/lan75xx.c                     |  4 +--
 drivers/usb/eth/lan78xx.c                     |  4 +--
 drivers/usb/eth/mcs7830.c                     |  4 +--
 drivers/usb/eth/r8152.c                       |  4 +--
 drivers/usb/eth/smsc95xx.c                    |  4 +--
 drivers/usb/gadget/dwc2_udc_otg.c             |  4 +--
 drivers/usb/gadget/ether.c                    |  4 +--
 drivers/usb/gadget/max3420_udc.c              |  2 +-
 drivers/usb/host/dwc2.c                       |  2 +-
 drivers/usb/host/dwc3-of-simple.c             |  2 +-
 drivers/usb/host/dwc3-sti-glue.c              |  2 +-
 drivers/usb/host/ehci-atmel.c                 |  4 +--
 drivers/usb/host/ehci-exynos.c                |  4 +--
 drivers/usb/host/ehci-fsl.c                   |  4 +--
 drivers/usb/host/ehci-generic.c               |  2 +-
 drivers/usb/host/ehci-marvell.c               |  4 +--
 drivers/usb/host/ehci-msm.c                   |  4 +--
 drivers/usb/host/ehci-mx5.c                   |  4 +--
 drivers/usb/host/ehci-mx6.c                   |  4 +--
 drivers/usb/host/ehci-omap.c                  |  4 +--
 drivers/usb/host/ehci-pci.c                   |  4 +--
 drivers/usb/host/ehci-tegra.c                 |  4 +--
 drivers/usb/host/ehci-vf.c                    |  4 +--
 drivers/usb/host/ehci-zynq.c                  |  4 +--
 drivers/usb/host/ohci-da8xx.c                 |  2 +-
 drivers/usb/host/ohci-generic.c               |  2 +-
 drivers/usb/host/ohci-pci.c                   |  4 +--
 drivers/usb/host/r8a66597-hcd.c               |  2 +-
 drivers/usb/host/usb-sandbox.c                |  2 +-
 drivers/usb/host/usb-uclass.c                 |  8 +++---
 drivers/usb/host/xhci-brcm.c                  |  4 +--
 drivers/usb/host/xhci-dwc3.c                  |  4 +--
 drivers/usb/host/xhci-exynos5.c               |  4 +--
 drivers/usb/host/xhci-fsl.c                   |  4 +--
 drivers/usb/host/xhci-mtk.c                   |  2 +-
 drivers/usb/host/xhci-mvebu.c                 |  4 +--
 drivers/usb/host/xhci-pci.c                   |  4 +--
 drivers/usb/host/xhci-rcar.c                  |  4 +--
 drivers/usb/mtu3/mtu3_plat.c                  |  6 ++--
 drivers/usb/musb-new/da8xx.c                  |  4 +--
 drivers/usb/musb-new/mt85xx.c                 |  4 +--
 drivers/usb/musb-new/omap2430.c               |  4 +--
 drivers/usb/musb-new/pic32.c                  |  4 +--
 drivers/usb/musb-new/sunxi.c                  |  4 +--
 drivers/usb/musb-new/ti-musb.c                |  8 +++---
 drivers/video/am335x-fb.c                     |  2 +-
 drivers/video/atmel_hlcdfb.c                  |  2 +-
 drivers/video/atmel_lcdfb.c                   |  4 +--
 drivers/video/backlight_gpio.c                |  2 +-
 drivers/video/bridge/anx6345.c                |  2 +-
 drivers/video/bridge/video-bridge-uclass.c    |  2 +-
 drivers/video/broadwell_igd.c                 |  4 +--
 drivers/video/console_truetype.c              |  2 +-
 drivers/video/display-uclass.c                |  2 +-
 drivers/video/dw_mipi_dsi.c                   |  2 +-
 drivers/video/exynos/exynos_dp.c              |  2 +-
 drivers/video/exynos/exynos_fb.c              |  2 +-
 drivers/video/ihs_video_out.c                 |  2 +-
 drivers/video/imx/mxc_ipuv3_fb.c              |  2 +-
 drivers/video/lg4573.c                        |  2 +-
 drivers/video/logicore_dp_tx.c                |  2 +-
 drivers/video/mali_dp.c                       |  2 +-
 drivers/video/meson/meson_dw_hdmi.c           |  2 +-
 drivers/video/meson/meson_vpu.c               |  2 +-
 drivers/video/mvebu_lcd.c                     |  2 +-
 drivers/video/nexell_display.c                |  4 +--
 drivers/video/orisetech_otm8009a.c            |  4 +--
 drivers/video/pwm_backlight.c                 |  2 +-
 drivers/video/raydium-rm68200.c               |  4 +--
 drivers/video/rockchip/rk3288_hdmi.c          |  2 +-
 drivers/video/rockchip/rk3288_mipi.c          |  2 +-
 drivers/video/rockchip/rk3288_vop.c           |  2 +-
 drivers/video/rockchip/rk3399_hdmi.c          |  2 +-
 drivers/video/rockchip/rk3399_mipi.c          |  2 +-
 drivers/video/rockchip/rk3399_vop.c           |  2 +-
 drivers/video/rockchip/rk_edp.c               |  2 +-
 drivers/video/rockchip/rk_lvds.c              |  2 +-
 drivers/video/sandbox_dsi_host.c              |  2 +-
 drivers/video/sandbox_osd.c                   |  2 +-
 drivers/video/sandbox_sdl.c                   |  2 +-
 drivers/video/simple_panel.c                  |  2 +-
 drivers/video/stm32/stm32_dsi.c               |  2 +-
 drivers/video/stm32/stm32_ltdc.c              |  2 +-
 drivers/video/sunxi/sunxi_dw_hdmi.c           |  2 +-
 drivers/video/sunxi/sunxi_lcd.c               |  2 +-
 drivers/video/tda19988.c                      |  2 +-
 drivers/video/tegra.c                         |  2 +-
 drivers/video/tegra124/dp.c                   |  4 +--
 drivers/video/tegra124/sor.c                  |  2 +-
 drivers/video/vidconsole-uclass.c             |  2 +-
 drivers/video/video-uclass.c                  |  6 ++--
 drivers/virtio/virtio-uclass.c                |  2 +-
 drivers/virtio/virtio_blk.c                   |  2 +-
 drivers/virtio/virtio_mmio.c                  |  2 +-
 drivers/virtio/virtio_net.c                   |  4 +--
 drivers/virtio/virtio_pci_legacy.c            |  2 +-
 drivers/virtio/virtio_pci_modern.c            |  2 +-
 drivers/virtio/virtio_rng.c                   |  2 +-
 drivers/virtio/virtio_sandbox.c               |  4 +--
 drivers/w1/mxc_w1.c                           |  2 +-
 drivers/w1/w1-gpio.c                          |  2 +-
 drivers/w1/w1-uclass.c                        |  4 +--
 drivers/watchdog/armada-37xx-wdt.c            |  2 +-
 drivers/watchdog/ast_wdt.c                    |  2 +-
 drivers/watchdog/at91sam9_wdt.c               |  2 +-
 drivers/watchdog/bcm6345_wdt.c                |  2 +-
 drivers/watchdog/cdns_wdt.c                   |  2 +-
 drivers/watchdog/designware_wdt.c             |  2 +-
 drivers/watchdog/imx_watchdog.c               |  2 +-
 drivers/watchdog/mt7621_wdt.c                 |  2 +-
 drivers/watchdog/mtk_wdt.c                    |  2 +-
 drivers/watchdog/octeontx_wdt.c               |  2 +-
 drivers/watchdog/omap_wdt.c                   |  2 +-
 drivers/watchdog/orion_wdt.c                  |  2 +-
 drivers/watchdog/rti_wdt.c                    |  2 +-
 drivers/watchdog/sbsa_gwdt.c                  |  2 +-
 drivers/watchdog/sp805_wdt.c                  |  2 +-
 drivers/watchdog/stm32mp_wdt.c                |  2 +-
 drivers/watchdog/xilinx_tb_wdt.c              |  2 +-
 drivers/watchdog/xilinx_wwdt.c                |  4 +--
 drivers/xen/pvblock.c                         |  2 +-
 include/dm/device.h                           | 18 ++++++------
 include/dm/uclass.h                           | 20 ++++++-------
 include/dwmmc.h                               |  2 +-
 include/sdhci.h                               |  2 +-
 include/spi.h                                 |  2 +-
 lib/efi_driver/efi_block_device.c             |  2 +-
 net/eth-uclass.c                              |  4 +--
 net/mdio-mux-uclass.c                         |  4 +--
 net/mdio-uclass.c                             |  2 +-
 test/dm/acpi.c                                |  2 +-
 test/dm/bus.c                                 | 28 +++++++++----------
 test/dm/core.c                                |  2 +-
 test/dm/mux-emul.c                            |  2 +-
 test/dm/regmap.c                              |  2 +-
 test/dm/test-driver.c                         |  4 +--
 test/dm/test-fdt.c                            | 14 +++++-----
 test/dm/test-uclass.c                         |  6 ++--
 955 files changed, 1364 insertions(+), 1368 deletions(-)

Comments

Simon Glass Dec. 13, 2020, 2:51 p.m. UTC | #1
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>
---

 arch/arm/mach-ipq40xx/clock-ipq4019.c         |  2 +-
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    |  2 +-
 arch/arm/mach-snapdragon/clock-snapdragon.c   |  2 +-
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  2 +-
 arch/arm/mach-stm32mp/bsec.c                  |  2 +-
 arch/arm/mach-stm32mp/pwr_regulator.c         |  2 +-
 arch/x86/cpu/acpi_gpe.c                       |  2 +-
 arch/x86/cpu/apollolake/hostbridge.c          |  2 +-
 arch/x86/cpu/apollolake/pmc.c                 |  2 +-
 arch/x86/cpu/apollolake/spl.c                 |  2 +-
 arch/x86/cpu/apollolake/uart.c                |  4 +--
 arch/x86/cpu/broadwell/cpu_full.c             |  2 +-
 arch/x86/cpu/broadwell/sata.c                 |  2 +-
 arch/x86/cpu/intel_common/itss.c              |  4 +--
 arch/x86/cpu/intel_common/p2sb.c              |  4 +--
 arch/x86/cpu/irq.c                            |  2 +-
 arch/x86/cpu/slimbootloader/serial.c          |  4 +--
 arch/x86/cpu/tangier/pinmux.c                 |  2 +-
 arch/x86/lib/pmu.c                            |  2 +-
 arch/x86/lib/scu.c                            |  2 +-
 board/renesas/ulcb/cpld.c                     |  2 +-
 common/usb_hub.c                              |  6 ++--
 common/usb_storage.c                          |  2 +-
 doc/driver-model/design.rst                   | 26 ++++++++---------
 doc/driver-model/ethernet.rst                 |  8 +++---
 doc/driver-model/of-plat.rst                  |  6 ++--
 doc/driver-model/spi-howto.rst                |  6 ++--
 doc/driver-model/usb-info.rst                 |  6 ++--
 doc/imx/clk/ccf.txt                           |  2 +-
 drivers/adc/adc-uclass.c                      |  2 +-
 drivers/adc/exynos-adc.c                      |  2 +-
 drivers/adc/meson-saradc.c                    |  2 +-
 drivers/adc/rockchip-saradc.c                 |  2 +-
 drivers/adc/sandbox.c                         |  2 +-
 drivers/adc/stm32-adc-core.c                  |  2 +-
 drivers/adc/stm32-adc.c                       |  2 +-
 drivers/ata/ahci-uclass.c                     |  2 +-
 drivers/ata/dwc_ahci.c                        |  2 +-
 drivers/ata/fsl_sata.c                        |  4 +--
 drivers/ata/mtk_ahci.c                        |  2 +-
 drivers/ata/sata_ceva.c                       |  2 +-
 drivers/ata/sata_mv.c                         |  2 +-
 drivers/ata/sata_sil.c                        |  4 +--
 drivers/axi/ihs_axi.c                         |  2 +-
 drivers/axi/sandbox_store.c                   |  2 +-
 drivers/block/blk-uclass.c                    |  2 +-
 drivers/block/sandbox.c                       |  2 +-
 drivers/bootcount/bootcount.c                 |  2 +-
 drivers/bootcount/i2c-eeprom.c                |  2 +-
 drivers/bootcount/rtc.c                       |  2 +-
 drivers/bootcount/spi-flash.c                 |  2 +-
 drivers/button/button-gpio.c                  |  2 +-
 drivers/button/button-uclass.c                |  2 +-
 drivers/cache/cache-v5l2.c                    |  2 +-
 drivers/clk/altera/clk-agilex.c               |  2 +-
 drivers/clk/altera/clk-arria10.c              |  2 +-
 drivers/clk/aspeed/clk_ast2500.c              |  2 +-
 drivers/clk/at91/compat.c                     | 22 +++++++--------
 drivers/clk/at91/sckc.c                       |  2 +-
 drivers/clk/clk-cdce9xx.c                     |  2 +-
 drivers/clk/clk-hsdk-cgu.c                    |  2 +-
 drivers/clk/clk-ti-sci.c                      |  2 +-
 drivers/clk/clk_bcm6345.c                     |  2 +-
 drivers/clk/clk_boston.c                      |  2 +-
 drivers/clk/clk_fixed_factor.c                |  2 +-
 drivers/clk/clk_fixed_rate.c                  |  2 +-
 drivers/clk/clk_octeon.c                      |  2 +-
 drivers/clk/clk_pic32.c                       |  2 +-
 drivers/clk/clk_sandbox.c                     |  2 +-
 drivers/clk/clk_sandbox_test.c                |  2 +-
 drivers/clk/clk_stm32f.c                      |  2 +-
 drivers/clk/clk_stm32h7.c                     |  2 +-
 drivers/clk/clk_stm32mp1.c                    |  2 +-
 drivers/clk/clk_versal.c                      |  2 +-
 drivers/clk/clk_vexpress_osc.c                |  2 +-
 drivers/clk/clk_zynq.c                        |  2 +-
 drivers/clk/clk_zynqmp.c                      |  2 +-
 drivers/clk/exynos/clk-exynos7420.c           |  4 +--
 drivers/clk/ics8n3qv01.c                      |  2 +-
 drivers/clk/mediatek/clk-mt7622.c             | 16 +++++------
 drivers/clk/mediatek/clk-mt7623.c             | 12 ++++----
 drivers/clk/mediatek/clk-mt7629.c             | 14 +++++-----
 drivers/clk/mediatek/clk-mt8512.c             |  8 +++---
 drivers/clk/mediatek/clk-mt8516.c             |  6 ++--
 drivers/clk/mediatek/clk-mt8518.c             |  6 ++--
 drivers/clk/meson/axg.c                       |  2 +-
 drivers/clk/meson/g12a.c                      |  2 +-
 drivers/clk/meson/gxbb.c                      |  2 +-
 drivers/clk/mpc83xx_clk.c                     |  2 +-
 drivers/clk/mtmips/clk-mt7628.c               |  2 +-
 drivers/clk/mvebu/armada-37xx-periph.c        |  2 +-
 drivers/clk/mvebu/armada-37xx-tbg.c           |  2 +-
 drivers/clk/owl/clk_owl.c                     |  2 +-
 drivers/clk/renesas/r8a774a1-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a774b1-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a774c0-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a774e1-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a7790-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7791-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7792-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7794-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7795-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a7796-cpg-mssr.c        |  2 +-
 drivers/clk/renesas/r8a77965-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77970-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77980-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77990-cpg-mssr.c       |  2 +-
 drivers/clk/renesas/r8a77995-cpg-mssr.c       |  2 +-
 drivers/clk/rockchip/clk_px30.c               |  4 +--
 drivers/clk/rockchip/clk_rk3036.c             |  2 +-
 drivers/clk/rockchip/clk_rk3128.c             |  2 +-
 drivers/clk/rockchip/clk_rk3188.c             |  4 +--
 drivers/clk/rockchip/clk_rk322x.c             |  2 +-
 drivers/clk/rockchip/clk_rk3288.c             |  4 +--
 drivers/clk/rockchip/clk_rk3308.c             |  2 +-
 drivers/clk/rockchip/clk_rk3328.c             |  2 +-
 drivers/clk/rockchip/clk_rk3368.c             |  4 +--
 drivers/clk/rockchip/clk_rk3399.c             |  8 +++---
 drivers/clk/rockchip/clk_rv1108.c             |  2 +-
 drivers/clk/sifive/fu540-prci.c               |  2 +-
 drivers/clk/sunxi/clk_a10.c                   |  2 +-
 drivers/clk/sunxi/clk_a10s.c                  |  2 +-
 drivers/clk/sunxi/clk_a23.c                   |  2 +-
 drivers/clk/sunxi/clk_a31.c                   |  2 +-
 drivers/clk/sunxi/clk_a64.c                   |  2 +-
 drivers/clk/sunxi/clk_a80.c                   |  2 +-
 drivers/clk/sunxi/clk_a83t.c                  |  2 +-
 drivers/clk/sunxi/clk_h3.c                    |  2 +-
 drivers/clk/sunxi/clk_h6.c                    |  2 +-
 drivers/clk/sunxi/clk_r40.c                   |  2 +-
 drivers/clk/sunxi/clk_v3s.c                   |  2 +-
 drivers/clk/uniphier/clk-uniphier-core.c      |  2 +-
 drivers/core/device-remove.c                  |  8 +++---
 drivers/core/device.c                         | 26 ++++++++---------
 drivers/core/simple-bus.c                     |  2 +-
 drivers/core/simple-pm-bus.c                  |  2 +-
 drivers/core/syscon-uclass.c                  |  2 +-
 drivers/core/uclass.c                         |  8 +++---
 drivers/cpu/at91_cpu.c                        |  2 +-
 drivers/cpu/bmips_cpu.c                       |  2 +-
 drivers/cpu/cpu-uclass.c                      |  2 +-
 drivers/cpu/imx8_cpu.c                        |  2 +-
 drivers/cpu/mpc83xx_cpu.c                     |  2 +-
 drivers/crypto/fsl/rng.c                      |  2 +-
 drivers/ddr/altera/sdram_gen5.c               |  4 +--
 drivers/ddr/altera/sdram_soc64.c              |  4 +--
 drivers/demo/demo-shape.c                     |  4 +--
 drivers/demo/demo-simple.c                    |  2 +-
 drivers/dma/bcm6348-iudma.c                   |  2 +-
 drivers/dma/dma-uclass.c                      |  2 +-
 drivers/dma/sandbox-dma-test.c                |  2 +-
 drivers/dma/ti-edma3.c                        |  2 +-
 drivers/dma/ti/k3-udma.c                      |  2 +-
 drivers/firmware/scmi/mailbox_agent.c         |  2 +-
 drivers/firmware/scmi/sandbox-scmi_agent.c    |  2 +-
 drivers/firmware/scmi/sandbox-scmi_devices.c  |  2 +-
 drivers/firmware/scmi/smccc_agent.c           |  2 +-
 drivers/firmware/ti_sci.c                     |  2 +-
 drivers/gpio/74x164_gpio.c                    |  2 +-
 drivers/gpio/altera_pio.c                     |  2 +-
 drivers/gpio/at91_gpio.c                      |  4 +--
 drivers/gpio/atmel_pio4.c                     |  2 +-
 drivers/gpio/bcm2835_gpio.c                   |  4 +--
 drivers/gpio/bcm6345_gpio.c                   |  2 +-
 drivers/gpio/cortina_gpio.c                   |  2 +-
 drivers/gpio/da8xx_gpio.c                     |  4 +--
 drivers/gpio/dwapb_gpio.c                     |  2 +-
 drivers/gpio/gpio-rcar.c                      |  2 +-
 drivers/gpio/gpio-rza1.c                      |  2 +-
 drivers/gpio/gpio-uclass.c                    |  6 ++--
 drivers/gpio/gpio-uniphier.c                  |  2 +-
 drivers/gpio/hi6220_gpio.c                    |  2 +-
 drivers/gpio/hsdk-creg-gpio.c                 |  2 +-
 drivers/gpio/imx_rgpio2p.c                    |  2 +-
 drivers/gpio/intel_broadwell_gpio.c           |  4 +--
 drivers/gpio/intel_ich6_gpio.c                |  4 +--
 drivers/gpio/iproc_gpio.c                     |  2 +-
 drivers/gpio/lpc32xx_gpio.c                   |  2 +-
 drivers/gpio/mpc83xx_spisel_boot.c            |  4 +--
 drivers/gpio/mpc8xxx_gpio.c                   |  4 +--
 drivers/gpio/mscc_sgpio.c                     |  2 +-
 drivers/gpio/msm_gpio.c                       |  2 +-
 drivers/gpio/mvebu_gpio.c                     |  2 +-
 drivers/gpio/mxc_gpio.c                       |  4 +--
 drivers/gpio/mxs_gpio.c                       |  4 +--
 drivers/gpio/nx_gpio.c                        |  2 +-
 drivers/gpio/octeon_gpio.c                    |  2 +-
 drivers/gpio/omap_gpio.c                      |  4 +--
 drivers/gpio/pca953x_gpio.c                   |  2 +-
 drivers/gpio/pcf8575_gpio.c                   |  2 +-
 drivers/gpio/pic32_gpio.c                     |  2 +-
 drivers/gpio/pm8916_gpio.c                    |  4 +--
 drivers/gpio/rk_gpio.c                        |  2 +-
 drivers/gpio/s5p_gpio.c                       |  2 +-
 drivers/gpio/sandbox.c                        |  2 +-
 drivers/gpio/sifive-gpio.c                    |  2 +-
 drivers/gpio/stm32_gpio.c                     |  2 +-
 drivers/gpio/tegra_gpio.c                     |  2 +-
 drivers/gpio/vybrid_gpio.c                    |  4 +--
 drivers/gpio/xilinx_gpio.c                    |  4 +--
 drivers/gpio/zynq_gpio.c                      |  2 +-
 drivers/hwspinlock/stm32_hwspinlock.c         |  2 +-
 drivers/i2c/ast_i2c.c                         |  2 +-
 drivers/i2c/at91_i2c.c                        |  4 +--
 drivers/i2c/cros_ec_tunnel.c                  |  2 +-
 drivers/i2c/davinci_i2c.c                     |  2 +-
 drivers/i2c/designware_i2c.c                  |  2 +-
 drivers/i2c/designware_i2c_pci.c              |  2 +-
 drivers/i2c/exynos_hs_i2c.c                   |  2 +-
 drivers/i2c/fsl_i2c.c                         |  2 +-
 drivers/i2c/i2c-cdns.c                        |  2 +-
 drivers/i2c/i2c-cortina.c                     |  2 +-
 drivers/i2c/i2c-emul-uclass.c                 |  4 +--
 drivers/i2c/i2c-gpio.c                        |  2 +-
 drivers/i2c/i2c-uclass.c                      |  8 +++---
 drivers/i2c/i2c-uniphier-f.c                  |  2 +-
 drivers/i2c/i2c-uniphier.c                    |  2 +-
 drivers/i2c/i2c-versatile.c                   |  2 +-
 drivers/i2c/ihs_i2c.c                         |  2 +-
 drivers/i2c/imx_lpi2c.c                       |  2 +-
 drivers/i2c/intel_i2c.c                       |  2 +-
 drivers/i2c/iproc_i2c.c                       |  2 +-
 drivers/i2c/meson_i2c.c                       |  2 +-
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c    |  2 +-
 drivers/i2c/muxes/i2c-mux-gpio.c              |  2 +-
 drivers/i2c/muxes/i2c-mux-uclass.c            |  4 +--
 drivers/i2c/muxes/pca954x.c                   |  2 +-
 drivers/i2c/mv_i2c.c                          |  2 +-
 drivers/i2c/mvtwsi.c                          |  2 +-
 drivers/i2c/mxc_i2c.c                         |  2 +-
 drivers/i2c/nx_i2c.c                          |  2 +-
 drivers/i2c/octeon_i2c.c                      |  2 +-
 drivers/i2c/omap24xx_i2c.c                    |  4 +--
 drivers/i2c/rcar_i2c.c                        |  2 +-
 drivers/i2c/rcar_iic.c                        |  2 +-
 drivers/i2c/rk_i2c.c                          |  2 +-
 drivers/i2c/s3c24x0_i2c.c                     |  2 +-
 drivers/i2c/sandbox_i2c.c                     |  2 +-
 drivers/i2c/stm32f7_i2c.c                     |  2 +-
 drivers/i2c/tegra186_bpmp_i2c.c               |  2 +-
 drivers/i2c/tegra_i2c.c                       |  2 +-
 drivers/i2c/xilinx_xiic.c                     |  2 +-
 drivers/input/cros_ec_keyb.c                  |  2 +-
 drivers/input/i8042.c                         |  2 +-
 drivers/input/keyboard-uclass.c               |  2 +-
 drivers/input/tegra-kbc.c                     |  2 +-
 drivers/led/led-uclass.c                      |  2 +-
 drivers/led/led_bcm6328.c                     |  2 +-
 drivers/led/led_bcm6358.c                     |  2 +-
 drivers/led/led_bcm6858.c                     |  2 +-
 drivers/led/led_cortina.c                     |  4 +--
 drivers/led/led_gpio.c                        |  2 +-
 drivers/mailbox/k3-sec-proxy.c                |  2 +-
 drivers/mailbox/sandbox-mbox-test.c           |  2 +-
 drivers/mailbox/sandbox-mbox.c                |  2 +-
 drivers/mailbox/stm32-ipcc.c                  |  2 +-
 drivers/mailbox/tegra-hsp.c                   |  2 +-
 drivers/mailbox/zynqmp-ipi.c                  |  2 +-
 drivers/memory/stm32-fmc2-ebi.c               |  2 +-
 drivers/misc/altera_sysid.c                   |  2 +-
 drivers/misc/atsha204a-i2c.c                  |  2 +-
 drivers/misc/cros_ec.c                        |  2 +-
 drivers/misc/cros_ec_sandbox.c                |  2 +-
 drivers/misc/fs_loader.c                      |  4 +--
 drivers/misc/gdsys_ioep.c                     |  2 +-
 drivers/misc/gdsys_rxaui_ctrl.c               |  2 +-
 drivers/misc/gdsys_soc.c                      |  2 +-
 drivers/misc/i2c_eeprom.c                     |  4 +--
 drivers/misc/i2c_eeprom_emul.c                |  4 +--
 drivers/misc/ihs_fpga.c                       |  2 +-
 drivers/misc/imx8/scu.c                       |  2 +-
 drivers/misc/irq_sandbox.c                    |  2 +-
 drivers/misc/k3_avs.c                         |  2 +-
 drivers/misc/microchip_flexcom.c              |  2 +-
 drivers/misc/misc_sandbox.c                   |  2 +-
 drivers/misc/mpc83xx_serdes.c                 |  2 +-
 drivers/misc/p2sb-uclass.c                    |  4 +--
 drivers/misc/p2sb_emul.c                      |  4 +--
 drivers/misc/p2sb_sandbox.c                   |  2 +-
 drivers/misc/rockchip-efuse.c                 |  2 +-
 drivers/misc/rockchip-otp.c                   |  2 +-
 drivers/misc/sandbox_adder.c                  |  2 +-
 drivers/misc/sifive-otp.c                     |  2 +-
 drivers/misc/swap_case.c                      |  4 +--
 drivers/misc/tegra186_bpmp.c                  |  2 +-
 drivers/mmc/am654_sdhci.c                     |  4 +--
 drivers/mmc/arm_pl180_mmci.c                  |  4 +--
 drivers/mmc/aspeed_sdhci.c                    |  4 +--
 drivers/mmc/atmel_sdhci.c                     |  4 +--
 drivers/mmc/bcm2835_sdhci.c                   |  4 +--
 drivers/mmc/bcm2835_sdhost.c                  |  4 +--
 drivers/mmc/bcmstb_sdhci.c                    |  4 +--
 drivers/mmc/ca_dw_mmc.c                       |  4 +--
 drivers/mmc/davinci_mmc.c                     |  4 +--
 drivers/mmc/exynos_dw_mmc.c                   |  4 +--
 drivers/mmc/fsl_esdhc.c                       |  4 +--
 drivers/mmc/fsl_esdhc_imx.c                   |  4 +--
 drivers/mmc/ftsdc010_mci.c                    |  4 +--
 drivers/mmc/gen_atmel_mci.c                   |  4 +--
 drivers/mmc/hi6220_dw_mmc.c                   |  4 +--
 drivers/mmc/iproc_sdhci.c                     |  4 +--
 drivers/mmc/jz_mmc.c                          |  4 +--
 drivers/mmc/meson_gx_mmc.c                    |  2 +-
 drivers/mmc/mmc-uclass.c                      |  2 +-
 drivers/mmc/mmc_spi.c                         |  4 +--
 drivers/mmc/msm_sdhci.c                       |  4 +--
 drivers/mmc/mtk-sd.c                          |  4 +--
 drivers/mmc/mv_sdhci.c                        |  4 +--
 drivers/mmc/mxsmmc.c                          |  4 +--
 drivers/mmc/nexell_dw_mmc.c                   |  4 +--
 drivers/mmc/octeontx_hsmmc.c                  |  2 +-
 drivers/mmc/omap_hsmmc.c                      |  4 +--
 drivers/mmc/pci_mmc.c                         |  4 +--
 drivers/mmc/pic32_sdhci.c                     |  4 +--
 drivers/mmc/pxa_mmc_gen.c                     |  2 +-
 drivers/mmc/renesas-sdhi.c                    |  4 +--
 drivers/mmc/rockchip_dw_mmc.c                 |  4 +--
 drivers/mmc/rockchip_sdhci.c                  |  4 +--
 drivers/mmc/s5p_sdhci.c                       |  4 +--
 drivers/mmc/sandbox_mmc.c                     |  2 +-
 drivers/mmc/sdhci-cadence.c                   |  4 +--
 drivers/mmc/sh_mmcif.c                        |  4 +--
 drivers/mmc/sh_sdhi.c                         |  4 +--
 drivers/mmc/snps_dw_mmc.c                     |  4 +--
 drivers/mmc/socfpga_dw_mmc.c                  |  4 +--
 drivers/mmc/sti_sdhci.c                       |  4 +--
 drivers/mmc/stm32_sdmmc2.c                    |  4 +--
 drivers/mmc/sunxi_mmc.c                       |  4 +--
 drivers/mmc/tangier_sdhci.c                   |  4 +--
 drivers/mmc/tegra_mmc.c                       |  4 +--
 drivers/mmc/uniphier-sd.c                     |  4 +--
 drivers/mmc/xenon_sdhci.c                     |  4 +--
 drivers/mmc/zynq_sdhci.c                      |  4 +--
 drivers/mtd/altera_qspi.c                     |  2 +-
 drivers/mtd/hbmc-am654.c                      |  2 +-
 drivers/mtd/mtd-uclass.c                      |  2 +-
 drivers/mtd/nand/raw/arasan_nfc.c             |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c  |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c  |  2 +-
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c  |  2 +-
 drivers/mtd/nand/raw/davinci_nand.c           |  2 +-
 drivers/mtd/nand/raw/denali_dt.c              |  2 +-
 drivers/mtd/nand/raw/mxs_nand_dt.c            |  2 +-
 drivers/mtd/nand/raw/octeontx_bch.c           |  4 +--
 drivers/mtd/nand/raw/octeontx_nand.c          |  2 +-
 drivers/mtd/nand/raw/pxa3xx_nand.c            |  2 +-
 drivers/mtd/nand/raw/stm32_fmc2_nand.c        |  2 +-
 drivers/mtd/nand/raw/tegra_nand.c             |  2 +-
 drivers/mtd/nand/raw/vf610_nfc.c              |  2 +-
 drivers/mtd/nand/raw/zynq_nand.c              |  2 +-
 drivers/mtd/nand/spi/core.c                   |  2 +-
 drivers/mtd/spi/sandbox.c                     |  4 +--
 drivers/mtd/spi/sf-uclass.c                   |  2 +-
 drivers/mtd/spi/sf_dataflash.c                |  2 +-
 drivers/mtd/spi/sf_probe.c                    |  2 +-
 drivers/mux/mux-uclass.c                      |  2 +-
 drivers/net/ag7xxx.c                          |  4 +--
 drivers/net/altera_tse.c                      |  4 +--
 drivers/net/bcm6348-eth.c                     |  4 +--
 drivers/net/bcm6368-eth.c                     |  4 +--
 drivers/net/bcmgenet.c                        |  4 +--
 drivers/net/dc2114x.c                         |  4 +--
 drivers/net/designware.c                      |  4 +--
 drivers/net/dwc_eth_qos.c                     |  4 +--
 drivers/net/dwmac_s700.c                      |  4 +--
 drivers/net/dwmac_socfpga.c                   |  4 +--
 drivers/net/e1000.c                           |  4 +--
 drivers/net/eepro100.c                        |  4 +--
 drivers/net/eth-phy-uclass.c                  |  2 +-
 drivers/net/ethoc.c                           |  4 +--
 drivers/net/fec_mxc.c                         |  4 +--
 drivers/net/fm/eth.c                          |  4 +--
 drivers/net/fm/fm.c                           |  2 +-
 drivers/net/fm/memac_phy.c                    |  4 +--
 drivers/net/fsl_enetc.c                       |  4 +--
 drivers/net/fsl_enetc_mdio.c                  |  2 +-
 drivers/net/fsl_ls_mdio.c                     |  2 +-
 drivers/net/fsl_mcdmafec.c                    |  4 +--
 drivers/net/fsl_mdio.c                        |  4 +--
 drivers/net/ftgmac100.c                       |  4 +--
 drivers/net/ftmac100.c                        |  4 +--
 drivers/net/gmac_rockchip.c                   |  4 +--
 drivers/net/higmacv300.c                      |  4 +--
 drivers/net/ks8851_mll.c                      |  4 +--
 drivers/net/ldpaa_eth/ldpaa_eth.c             |  4 +--
 drivers/net/macb.c                            |  4 +--
 drivers/net/mcffec.c                          |  4 +--
 drivers/net/mdio-ipq4019.c                    |  2 +-
 drivers/net/mdio_mux_i2creg.c                 |  2 +-
 drivers/net/mdio_mux_sandbox.c                |  2 +-
 drivers/net/mdio_sandbox.c                    |  2 +-
 drivers/net/mscc_eswitch/jr2_switch.c         |  4 +--
 drivers/net/mscc_eswitch/luton_switch.c       |  4 +--
 drivers/net/mscc_eswitch/ocelot_switch.c      |  4 +--
 drivers/net/mscc_eswitch/serval_switch.c      |  4 +--
 drivers/net/mscc_eswitch/servalt_switch.c     |  4 +--
 drivers/net/mt7628-eth.c                      |  4 +--
 drivers/net/mtk_eth.c                         |  4 +--
 drivers/net/mvgbe.c                           |  4 +--
 drivers/net/mvmdio.c                          |  2 +-
 drivers/net/mvneta.c                          |  4 +--
 drivers/net/mvpp2.c                           |  6 ++--
 drivers/net/octeontx/bgx.c                    |  2 +-
 drivers/net/octeontx/nic_main.c               |  2 +-
 drivers/net/octeontx/nicvf_main.c             |  4 +--
 drivers/net/octeontx2/cgx.c                   |  2 +-
 drivers/net/octeontx2/rvu_af.c                |  2 +-
 drivers/net/octeontx2/rvu_pf.c                |  4 +--
 drivers/net/pch_gbe.c                         |  4 +--
 drivers/net/pcnet.c                           |  4 +--
 drivers/net/pfe_eth/pfe_eth.c                 |  4 +--
 drivers/net/pic32_eth.c                       |  4 +--
 drivers/net/qe/dm_qe_uec.c                    |  4 +--
 drivers/net/qe/dm_qe_uec_phy.c                |  2 +-
 drivers/net/ravb.c                            |  4 +--
 drivers/net/rtl8139.c                         |  4 +--
 drivers/net/rtl8169.c                         |  4 +--
 drivers/net/sandbox-raw.c                     |  4 +--
 drivers/net/sandbox.c                         |  4 +--
 drivers/net/sh_eth.c                          |  4 +--
 drivers/net/smc911x.c                         |  4 +--
 drivers/net/sni_ave.c                         |  4 +--
 drivers/net/sun8i_emac.c                      |  4 +--
 drivers/net/sunxi_emac.c                      |  4 +--
 drivers/net/ti/am65-cpsw-nuss.c               |  4 +--
 drivers/net/ti/cpsw.c                         |  4 +--
 drivers/net/ti/davinci_emac.c                 |  2 +-
 drivers/net/ti/keystone_net.c                 |  8 +++---
 drivers/net/tsec.c                            |  4 +--
 drivers/net/xilinx_axi_emac.c                 |  4 +--
 drivers/net/xilinx_emaclite.c                 |  4 +--
 drivers/net/zynq_gem.c                        |  4 +--
 drivers/nvme/nvme.c                           |  4 +--
 drivers/pch/sandbox_pch.c                     |  2 +-
 drivers/pci/pci-aardvark.c                    |  2 +-
 drivers/pci/pci-emul-uclass.c                 |  6 ++--
 drivers/pci/pci-rcar-gen2.c                   |  2 +-
 drivers/pci/pci-rcar-gen3.c                   |  2 +-
 drivers/pci/pci-uclass.c                      |  4 +--
 drivers/pci/pci_mpc85xx.c                     |  2 +-
 drivers/pci/pci_mvebu.c                       |  2 +-
 drivers/pci/pci_octeontx.c                    |  2 +-
 drivers/pci/pci_sandbox.c                     |  4 +--
 drivers/pci/pci_tegra.c                       |  2 +-
 drivers/pci/pcie_brcmstb.c                    |  2 +-
 drivers/pci/pcie_dw_mvebu.c                   |  2 +-
 drivers/pci/pcie_dw_ti.c                      |  2 +-
 drivers/pci/pcie_ecam_generic.c               |  2 +-
 drivers/pci/pcie_fsl.c                        |  2 +-
 drivers/pci/pcie_imx.c                        |  2 +-
 drivers/pci/pcie_intel_fpga.c                 |  2 +-
 drivers/pci/pcie_iproc.c                      |  2 +-
 drivers/pci/pcie_layerscape_ep.c              |  2 +-
 drivers/pci/pcie_layerscape_gen4.c            |  2 +-
 drivers/pci/pcie_layerscape_rc.c              |  2 +-
 drivers/pci/pcie_mediatek.c                   |  4 +--
 drivers/pci/pcie_phytium.c                    |  2 +-
 drivers/pci/pcie_rockchip.c                   |  2 +-
 drivers/pci/pcie_xilinx.c                     |  2 +-
 drivers/pci_endpoint/pcie-cadence-ep.c        |  2 +-
 drivers/pci_endpoint/sandbox-pci_ep.c         |  2 +-
 drivers/phy/allwinner/phy-sun4i-usb.c         |  4 +--
 drivers/phy/bcm6318-usbh-phy.c                |  2 +-
 drivers/phy/bcm6348-usbh-phy.c                |  2 +-
 drivers/phy/bcm6358-usbh-phy.c                |  2 +-
 drivers/phy/bcm6368-usbh-phy.c                |  2 +-
 drivers/phy/keystone-usb-phy.c                |  2 +-
 drivers/phy/marvell/comphy_core.c             |  2 +-
 drivers/phy/meson-g12a-usb2.c                 |  2 +-
 drivers/phy/meson-g12a-usb3-pcie.c            |  2 +-
 drivers/phy/meson-gxbb-usb2.c                 |  2 +-
 drivers/phy/meson-gxl-usb2.c                  |  2 +-
 drivers/phy/msm8916-usbh-phy.c                |  2 +-
 drivers/phy/mt76x8-usb-phy.c                  |  2 +-
 drivers/phy/nop-phy.c                         |  2 +-
 drivers/phy/omap-usb2-phy.c                   |  2 +-
 drivers/phy/phy-bcm-sr-pcie.c                 |  4 +--
 drivers/phy/phy-mtk-tphy.c                    |  2 +-
 drivers/phy/phy-qcom-ipq4019-usb.c            |  4 +--
 drivers/phy/phy-rcar-gen2.c                   |  2 +-
 drivers/phy/phy-rcar-gen3.c                   |  2 +-
 drivers/phy/phy-stm32-usbphyc.c               |  2 +-
 drivers/phy/phy-ti-am654.c                    |  4 +--
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c |  2 +-
 drivers/phy/rockchip/phy-rockchip-pcie.c      |  2 +-
 drivers/phy/rockchip/phy-rockchip-typec.c     |  2 +-
 drivers/phy/sandbox-phy.c                     |  2 +-
 drivers/phy/sti_usb_phy.c                     |  2 +-
 drivers/phy/ti-pipe3-phy.c                    |  2 +-
 drivers/pinctrl/aspeed/pinctrl_ast2500.c      |  2 +-
 drivers/pinctrl/ath79/pinctrl_ar933x.c        |  2 +-
 drivers/pinctrl/ath79/pinctrl_qca953x.c       |  2 +-
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c    |  2 +-
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c    |  2 +-
 drivers/pinctrl/exynos/pinctrl-exynos7420.c   |  2 +-
 drivers/pinctrl/intel/pinctrl_apl.c           |  4 +--
 drivers/pinctrl/mediatek/pinctrl-mt7622.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt7623.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt7629.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8512.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8516.c     |  2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8518.c     |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-axg.c     |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-g12a.c    |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c    |  2 +-
 drivers/pinctrl/meson/pinctrl-meson-gxl.c     |  2 +-
 drivers/pinctrl/mscc/pinctrl-jr2.c            |  2 +-
 drivers/pinctrl/mscc/pinctrl-luton.c          |  2 +-
 drivers/pinctrl/mscc/pinctrl-ocelot.c         |  2 +-
 drivers/pinctrl/mscc/pinctrl-serval.c         |  2 +-
 drivers/pinctrl/mscc/pinctrl-servalt.c        |  2 +-
 drivers/pinctrl/mtmips/pinctrl-mt7628.c       |  2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c   |  2 +-
 drivers/pinctrl/mvebu/pinctrl-mvebu.c         |  2 +-
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c      |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx5.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx6.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx7.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c         |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx8.c            |  2 +-
 drivers/pinctrl/nxp/pinctrl-imx8m.c           |  2 +-
 drivers/pinctrl/nxp/pinctrl-imxrt.c           |  2 +-
 drivers/pinctrl/nxp/pinctrl-mxs.c             |  2 +-
 drivers/pinctrl/nxp/pinctrl-vf610.c           |  2 +-
 drivers/pinctrl/pinctrl-at91-pio4.c           |  2 +-
 drivers/pinctrl/pinctrl-at91.c                |  2 +-
 drivers/pinctrl/pinctrl-kendryte.c            |  2 +-
 drivers/pinctrl/pinctrl-qe-io.c               |  2 +-
 drivers/pinctrl/pinctrl-sandbox.c             |  2 +-
 drivers/pinctrl/pinctrl-single.c              |  2 +-
 drivers/pinctrl/pinctrl-sti.c                 |  2 +-
 drivers/pinctrl/pinctrl-stmfx.c               |  2 +-
 drivers/pinctrl/pinctrl_pic32.c               |  2 +-
 drivers/pinctrl/pinctrl_stm32.c               |  2 +-
 drivers/pinctrl/renesas/pfc-r7s72100.c        |  2 +-
 drivers/pinctrl/renesas/pfc.c                 |  2 +-
 drivers/pinctrl/rockchip/pinctrl-px30.c       |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3036.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3128.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3188.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk322x.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3288.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3308.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3328.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3368.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rk3399.c     |  2 +-
 drivers/pinctrl/rockchip/pinctrl-rv1108.c     |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld11.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld20.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld4.c   |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-ld6b.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pro4.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pro5.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pxs2.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-pxs3.c  |  2 +-
 .../pinctrl/uniphier/pinctrl-uniphier-sld8.c  |  2 +-
 drivers/power/acpi_pmc/acpi-pmc-uclass.c      |  2 +-
 drivers/power/acpi_pmc/pmc_emul.c             |  4 +--
 drivers/power/acpi_pmc/sandbox.c              |  2 +-
 drivers/power/domain/bcm6328-power-domain.c   |  2 +-
 .../power/domain/imx8-power-domain-legacy.c   |  4 +--
 drivers/power/domain/imx8m-power-domain.c     |  2 +-
 drivers/power/domain/meson-ee-pwrc.c          |  2 +-
 drivers/power/domain/meson-gx-pwrc-vpu.c      |  2 +-
 drivers/power/domain/mtk-power-domain.c       |  2 +-
 .../power/domain/sandbox-power-domain-test.c  |  2 +-
 drivers/power/domain/sandbox-power-domain.c   |  2 +-
 drivers/power/domain/ti-sci-power-domain.c    |  2 +-
 drivers/power/pmic/i2c_pmic_emul.c            |  2 +-
 drivers/power/pmic/pm8916.c                   |  2 +-
 drivers/power/pmic/pmic-uclass.c              |  2 +-
 drivers/power/pmic/rk8xx.c                    |  2 +-
 drivers/power/regulator/bd71837.c             |  2 +-
 drivers/power/regulator/da9063.c              |  4 +--
 drivers/power/regulator/fan53555.c            |  4 +--
 drivers/power/regulator/fixed.c               |  2 +-
 drivers/power/regulator/gpio-regulator.c      |  2 +-
 drivers/power/regulator/pbias_regulator.c     |  2 +-
 drivers/power/regulator/pfuze100.c            |  2 +-
 drivers/power/regulator/pwm_regulator.c       |  2 +-
 drivers/power/regulator/regulator-uclass.c    |  2 +-
 drivers/power/regulator/stm32-vrefbuf.c       |  2 +-
 drivers/power/regulator/tps62360_regulator.c  |  2 +-
 drivers/power/regulator/tps65910_regulator.c  |  6 ++--
 drivers/pwm/exynos_pwm.c                      |  2 +-
 drivers/pwm/pwm-imx.c                         |  2 +-
 drivers/pwm/pwm-meson.c                       |  2 +-
 drivers/pwm/pwm-mtk.c                         |  2 +-
 drivers/pwm/pwm-sifive.c                      |  2 +-
 drivers/pwm/rk_pwm.c                          |  2 +-
 drivers/pwm/sandbox_pwm.c                     |  2 +-
 drivers/pwm/sunxi_pwm.c                       |  2 +-
 drivers/pwm/tegra_pwm.c                       |  2 +-
 drivers/ram/aspeed/sdram_ast2500.c            |  2 +-
 drivers/ram/bmips_ram.c                       |  2 +-
 drivers/ram/imxrt_sdram.c                     |  2 +-
 drivers/ram/k3-am654-ddrss.c                  |  2 +-
 drivers/ram/k3-j721e/k3-j721e-ddrss.c         |  2 +-
 drivers/ram/mediatek/ddr3-mt7629.c            |  2 +-
 drivers/ram/mpc83xx_sdram.c                   |  2 +-
 drivers/ram/octeon/octeon_ddr.c               |  2 +-
 drivers/ram/rockchip/dmc-rk3368.c             |  6 ++--
 drivers/ram/rockchip/sdram_px30.c             |  2 +-
 drivers/ram/rockchip/sdram_rk3128.c           |  2 +-
 drivers/ram/rockchip/sdram_rk3188.c           |  4 +--
 drivers/ram/rockchip/sdram_rk322x.c           |  4 +--
 drivers/ram/rockchip/sdram_rk3288.c           |  4 +--
 drivers/ram/rockchip/sdram_rk3308.c           |  2 +-
 drivers/ram/rockchip/sdram_rk3328.c           |  4 +--
 drivers/ram/rockchip/sdram_rk3399.c           |  4 +--
 drivers/ram/sifive/fu540_ddr.c                |  4 +--
 drivers/ram/stm32_sdram.c                     |  2 +-
 drivers/ram/stm32mp1/stm32mp1_ram.c           |  2 +-
 drivers/remoteproc/k3_system_controller.c     |  2 +-
 drivers/remoteproc/rproc-uclass.c             |  2 +-
 drivers/remoteproc/sandbox_testproc.c         |  2 +-
 drivers/remoteproc/stm32_copro.c              |  2 +-
 drivers/remoteproc/ti_k3_arm64_rproc.c        |  2 +-
 drivers/remoteproc/ti_k3_dsp_rproc.c          |  2 +-
 drivers/remoteproc/ti_k3_r5f_rproc.c          |  4 +--
 drivers/remoteproc/ti_power_proc.c            |  2 +-
 drivers/reset/reset-ast2500.c                 |  2 +-
 drivers/reset/reset-bcm6345.c                 |  2 +-
 drivers/reset/reset-hisilicon.c               |  2 +-
 drivers/reset/reset-hsdk.c                    |  2 +-
 drivers/reset/reset-imx7.c                    |  2 +-
 drivers/reset/reset-ipq4019.c                 |  2 +-
 drivers/reset/reset-mediatek.c                |  2 +-
 drivers/reset/reset-meson.c                   |  2 +-
 drivers/reset/reset-mtmips.c                  |  2 +-
 drivers/reset/reset-rockchip.c                |  2 +-
 drivers/reset/reset-sifive.c                  |  2 +-
 drivers/reset/reset-socfpga.c                 |  2 +-
 drivers/reset/reset-sunxi.c                   |  2 +-
 drivers/reset/reset-syscon.c                  |  2 +-
 drivers/reset/reset-ti-sci.c                  |  2 +-
 drivers/reset/reset-uniphier.c                |  2 +-
 drivers/reset/sandbox-reset-test.c            |  2 +-
 drivers/reset/sandbox-reset.c                 |  2 +-
 drivers/reset/sti-reset.c                     |  2 +-
 drivers/reset/stm32-reset.c                   |  2 +-
 drivers/rng/meson-rng.c                       |  2 +-
 drivers/rng/msm_rng.c                         |  2 +-
 drivers/rng/rockchip_rng.c                    |  2 +-
 drivers/rng/stm32mp1_rng.c                    |  2 +-
 drivers/rtc/ds3232.c                          |  2 +-
 drivers/rtc/emul_rtc.c                        |  2 +-
 drivers/rtc/i2c_rtc_emul.c                    |  4 +--
 drivers/rtc/pl031.c                           |  2 +-
 drivers/rtc/stm32_rtc.c                       |  2 +-
 drivers/scsi/scsi-uclass.c                    |  2 +-
 drivers/serial/altera_jtag_uart.c             |  2 +-
 drivers/serial/altera_uart.c                  |  2 +-
 drivers/serial/atmel_usart.c                  |  4 +--
 drivers/serial/lpc32xx_hsuart.c               |  2 +-
 drivers/serial/ns16550.c                      |  4 +--
 drivers/serial/sandbox.c                      |  4 +--
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial_ar933x.c                |  2 +-
 drivers/serial/serial_arc.c                   |  2 +-
 drivers/serial/serial_bcm283x_mu.c            |  4 +--
 drivers/serial/serial_bcm283x_pl011.c         |  4 +--
 drivers/serial/serial_bcm6345.c               |  2 +-
 drivers/serial/serial_coreboot.c              |  4 +--
 drivers/serial/serial_cortina.c               |  2 +-
 drivers/serial/serial_efi.c                   |  2 +-
 drivers/serial/serial_intel_mid.c             |  4 +--
 drivers/serial/serial_linflexuart.c           |  2 +-
 drivers/serial/serial_lpuart.c                |  2 +-
 drivers/serial/serial_mcf.c                   |  2 +-
 drivers/serial/serial_meson.c                 |  2 +-
 drivers/serial/serial_msm.c                   |  2 +-
 drivers/serial/serial_mtk.c                   |  2 +-
 drivers/serial/serial_mvebu_a3700.c           |  2 +-
 drivers/serial/serial_mxc.c                   |  2 +-
 drivers/serial/serial_omap.c                  |  4 +--
 drivers/serial/serial_owl.c                   |  2 +-
 drivers/serial/serial_pic32.c                 |  2 +-
 drivers/serial/serial_pl01x.c                 |  4 +--
 drivers/serial/serial_rockchip.c              |  8 +++---
 drivers/serial/serial_s5p.c                   |  2 +-
 drivers/serial/serial_sh.c                    |  4 +--
 drivers/serial/serial_sifive.c                |  2 +-
 drivers/serial/serial_sti_asc.c               |  2 +-
 drivers/serial/serial_stm32.c                 |  2 +-
 drivers/serial/serial_uniphier.c              |  2 +-
 drivers/serial/serial_xen.c                   |  2 +-
 drivers/serial/serial_xuartlite.c             |  2 +-
 drivers/serial/serial_zynq.c                  |  2 +-
 drivers/soc/soc_ti_k3.c                       |  2 +-
 drivers/soc/ti/k3-navss-ringacc.c             |  2 +-
 drivers/sound/broadwell_i2s.c                 |  2 +-
 drivers/sound/hda_codec.c                     |  2 +-
 drivers/sound/i2s-uclass.c                    |  2 +-
 drivers/sound/ivybridge_sound.c               |  2 +-
 drivers/sound/max98088.c                      |  2 +-
 drivers/sound/max98090.c                      |  2 +-
 drivers/sound/max98095.c                      |  2 +-
 drivers/sound/rt5677.c                        |  2 +-
 drivers/sound/sandbox.c                       |  6 ++--
 drivers/sound/sound-uclass.c                  |  2 +-
 drivers/sound/tegra_ahub.c                    |  2 +-
 drivers/sound/wm8994.c                        |  2 +-
 drivers/spi/altera_spi.c                      |  4 +--
 drivers/spi/atcspi200_spi.c                   |  2 +-
 drivers/spi/ath79_spi.c                       |  2 +-
 drivers/spi/atmel-quadspi.c                   |  2 +-
 drivers/spi/atmel_spi.c                       |  4 +--
 drivers/spi/bcm63xx_hsspi.c                   |  2 +-
 drivers/spi/bcm63xx_spi.c                     |  2 +-
 drivers/spi/bcmstb_spi.c                      |  4 +--
 drivers/spi/cadence_qspi.c                    |  4 +--
 drivers/spi/cf_spi.c                          |  4 +--
 drivers/spi/davinci_spi.c                     |  4 +--
 drivers/spi/designware_spi.c                  |  4 +--
 drivers/spi/exynos_spi.c                      |  4 +--
 drivers/spi/fsl_dspi.c                        |  4 +--
 drivers/spi/fsl_espi.c                        |  4 +--
 drivers/spi/fsl_qspi.c                        |  2 +-
 drivers/spi/ich.c                             |  4 +--
 drivers/spi/kirkwood_spi.c                    |  4 +--
 drivers/spi/meson_spifc.c                     |  2 +-
 drivers/spi/mpc8xxx_spi.c                     |  2 +-
 drivers/spi/mscc_bb_spi.c                     |  2 +-
 drivers/spi/mt7621_spi.c                      |  2 +-
 drivers/spi/mtk_snfi_spi.c                    |  2 +-
 drivers/spi/mvebu_a3700_spi.c                 |  2 +-
 drivers/spi/mxc_spi.c                         |  2 +-
 drivers/spi/mxs_spi.c                         |  4 +--
 drivers/spi/nxp_fspi.c                        |  2 +-
 drivers/spi/octeon_spi.c                      |  2 +-
 drivers/spi/omap3_spi.c                       |  4 +--
 drivers/spi/pic32_spi.c                       |  2 +-
 drivers/spi/pl022_spi.c                       |  4 +--
 drivers/spi/renesas_rpc_spi.c                 |  4 +--
 drivers/spi/rk_spi.c                          |  4 +--
 drivers/spi/sh_qspi.c                         |  2 +-
 drivers/spi/soft_spi.c                        |  4 +--
 drivers/spi/spi-qup.c                         |  2 +-
 drivers/spi/spi-sifive.c                      |  2 +-
 drivers/spi/spi-sunxi.c                       |  4 +--
 drivers/spi/spi-uclass.c                      |  6 ++--
 drivers/spi/stm32_qspi.c                      |  2 +-
 drivers/spi/stm32_spi.c                       |  2 +-
 drivers/spi/tegra114_spi.c                    |  4 +--
 drivers/spi/tegra20_sflash.c                  |  4 +--
 drivers/spi/tegra20_slink.c                   |  4 +--
 drivers/spi/tegra210_qspi.c                   |  6 ++--
 drivers/spi/ti_qspi.c                         |  2 +-
 drivers/spi/uniphier_spi.c                    |  4 +--
 drivers/spi/xilinx_spi.c                      |  2 +-
 drivers/spi/zynq_qspi.c                       |  4 +--
 drivers/spi/zynq_spi.c                        |  4 +--
 drivers/spi/zynqmp_gqspi.c                    |  4 +--
 drivers/spmi/spmi-msm.c                       |  2 +-
 drivers/spmi/spmi-sandbox.c                   |  2 +-
 drivers/sysinfo/gazerbeam.c                   |  2 +-
 drivers/sysinfo/sandbox.c                     |  2 +-
 drivers/sysreset/poweroff_gpio.c              |  2 +-
 drivers/sysreset/sysreset-ti-sci.c            |  2 +-
 drivers/sysreset/sysreset_gpio.c              |  2 +-
 drivers/sysreset/sysreset_octeon.c            |  2 +-
 drivers/sysreset/sysreset_resetctl.c          |  2 +-
 drivers/sysreset/sysreset_socfpga.c           |  2 +-
 drivers/sysreset/sysreset_sti.c               |  2 +-
 drivers/sysreset/sysreset_syscon.c            |  2 +-
 drivers/sysreset/sysreset_watchdog.c          |  2 +-
 drivers/sysreset/sysreset_x86.c               |  2 +-
 drivers/tee/optee/core.c                      |  4 +--
 drivers/tee/sandbox.c                         |  2 +-
 drivers/tee/tee-uclass.c                      |  2 +-
 drivers/thermal/imx_scu_thermal.c             |  2 +-
 drivers/thermal/imx_thermal.c                 |  2 +-
 drivers/thermal/imx_tmu.c                     |  2 +-
 drivers/thermal/ti-bandgap.c                  |  2 +-
 drivers/timer/ag101p_timer.c                  |  2 +-
 drivers/timer/altera_timer.c                  |  2 +-
 drivers/timer/arc_timer.c                     |  2 +-
 drivers/timer/ast_timer.c                     |  2 +-
 drivers/timer/atcpit100_timer.c               |  2 +-
 drivers/timer/atmel_pit_timer.c               |  2 +-
 drivers/timer/cadence-ttc.c                   |  2 +-
 drivers/timer/dw-apb-timer.c                  |  2 +-
 drivers/timer/mchp-pit64b-timer.c             |  2 +-
 drivers/timer/mpc83xx_timer.c                 |  2 +-
 drivers/timer/mtk_timer.c                     |  2 +-
 drivers/timer/nomadik-mtu-timer.c             |  2 +-
 drivers/timer/omap-timer.c                    |  2 +-
 drivers/timer/ostm_timer.c                    |  2 +-
 drivers/timer/rockchip_timer.c                |  4 +--
 drivers/timer/sti-timer.c                     |  2 +-
 drivers/timer/stm32_timer.c                   |  2 +-
 drivers/timer/timer-uclass.c                  |  2 +-
 drivers/tpm/cr50_i2c.c                        |  2 +-
 drivers/tpm/tpm-uclass.c                      |  2 +-
 drivers/tpm/tpm2_ftpm_tee.c                   |  2 +-
 drivers/tpm/tpm2_tis_sandbox.c                |  2 +-
 drivers/tpm/tpm2_tis_spi.c                    |  2 +-
 drivers/tpm/tpm_tis_infineon.c                |  2 +-
 drivers/tpm/tpm_tis_lpc.c                     |  2 +-
 drivers/tpm/tpm_tis_sandbox.c                 |  2 +-
 drivers/tpm/tpm_tis_st33zp24_i2c.c            |  2 +-
 drivers/tpm/tpm_tis_st33zp24_spi.c            |  4 +--
 drivers/ufs/ufs-uclass.c                      |  2 +-
 drivers/usb/cdns3/cdns3-ti.c                  |  2 +-
 drivers/usb/cdns3/core.c                      |  4 +--
 drivers/usb/dwc3/dwc3-generic.c               | 10 +++----
 drivers/usb/dwc3/dwc3-meson-g12a.c            |  2 +-
 drivers/usb/dwc3/dwc3-meson-gxl.c             |  2 +-
 drivers/usb/emul/sandbox_flash.c              |  4 +--
 drivers/usb/emul/sandbox_hub.c                |  4 +--
 drivers/usb/emul/sandbox_keyb.c               |  4 +--
 drivers/usb/emul/usb-emul-uclass.c            |  6 ++--
 drivers/usb/eth/asix.c                        |  4 +--
 drivers/usb/eth/asix88179.c                   |  4 +--
 drivers/usb/eth/lan75xx.c                     |  4 +--
 drivers/usb/eth/lan78xx.c                     |  4 +--
 drivers/usb/eth/mcs7830.c                     |  4 +--
 drivers/usb/eth/r8152.c                       |  4 +--
 drivers/usb/eth/smsc95xx.c                    |  4 +--
 drivers/usb/gadget/dwc2_udc_otg.c             |  4 +--
 drivers/usb/gadget/ether.c                    |  4 +--
 drivers/usb/gadget/max3420_udc.c              |  2 +-
 drivers/usb/host/dwc2.c                       |  2 +-
 drivers/usb/host/dwc3-of-simple.c             |  2 +-
 drivers/usb/host/dwc3-sti-glue.c              |  2 +-
 drivers/usb/host/ehci-atmel.c                 |  4 +--
 drivers/usb/host/ehci-exynos.c                |  4 +--
 drivers/usb/host/ehci-fsl.c                   |  4 +--
 drivers/usb/host/ehci-generic.c               |  2 +-
 drivers/usb/host/ehci-marvell.c               |  4 +--
 drivers/usb/host/ehci-msm.c                   |  4 +--
 drivers/usb/host/ehci-mx5.c                   |  4 +--
 drivers/usb/host/ehci-mx6.c                   |  4 +--
 drivers/usb/host/ehci-omap.c                  |  4 +--
 drivers/usb/host/ehci-pci.c                   |  4 +--
 drivers/usb/host/ehci-tegra.c                 |  4 +--
 drivers/usb/host/ehci-vf.c                    |  4 +--
 drivers/usb/host/ehci-zynq.c                  |  4 +--
 drivers/usb/host/ohci-da8xx.c                 |  2 +-
 drivers/usb/host/ohci-generic.c               |  2 +-
 drivers/usb/host/ohci-pci.c                   |  4 +--
 drivers/usb/host/r8a66597-hcd.c               |  2 +-
 drivers/usb/host/usb-sandbox.c                |  2 +-
 drivers/usb/host/usb-uclass.c                 |  8 +++---
 drivers/usb/host/xhci-brcm.c                  |  4 +--
 drivers/usb/host/xhci-dwc3.c                  |  4 +--
 drivers/usb/host/xhci-exynos5.c               |  4 +--
 drivers/usb/host/xhci-fsl.c                   |  4 +--
 drivers/usb/host/xhci-mtk.c                   |  2 +-
 drivers/usb/host/xhci-mvebu.c                 |  4 +--
 drivers/usb/host/xhci-pci.c                   |  4 +--
 drivers/usb/host/xhci-rcar.c                  |  4 +--
 drivers/usb/mtu3/mtu3_plat.c                  |  6 ++--
 drivers/usb/musb-new/da8xx.c                  |  4 +--
 drivers/usb/musb-new/mt85xx.c                 |  4 +--
 drivers/usb/musb-new/omap2430.c               |  4 +--
 drivers/usb/musb-new/pic32.c                  |  4 +--
 drivers/usb/musb-new/sunxi.c                  |  4 +--
 drivers/usb/musb-new/ti-musb.c                |  8 +++---
 drivers/video/am335x-fb.c                     |  2 +-
 drivers/video/atmel_hlcdfb.c                  |  2 +-
 drivers/video/atmel_lcdfb.c                   |  4 +--
 drivers/video/backlight_gpio.c                |  2 +-
 drivers/video/bridge/anx6345.c                |  2 +-
 drivers/video/bridge/video-bridge-uclass.c    |  2 +-
 drivers/video/broadwell_igd.c                 |  4 +--
 drivers/video/console_truetype.c              |  2 +-
 drivers/video/display-uclass.c                |  2 +-
 drivers/video/dw_mipi_dsi.c                   |  2 +-
 drivers/video/exynos/exynos_dp.c              |  2 +-
 drivers/video/exynos/exynos_fb.c              |  2 +-
 drivers/video/ihs_video_out.c                 |  2 +-
 drivers/video/imx/mxc_ipuv3_fb.c              |  2 +-
 drivers/video/lg4573.c                        |  2 +-
 drivers/video/logicore_dp_tx.c                |  2 +-
 drivers/video/mali_dp.c                       |  2 +-
 drivers/video/meson/meson_dw_hdmi.c           |  2 +-
 drivers/video/meson/meson_vpu.c               |  2 +-
 drivers/video/mvebu_lcd.c                     |  2 +-
 drivers/video/nexell_display.c                |  4 +--
 drivers/video/orisetech_otm8009a.c            |  4 +--
 drivers/video/pwm_backlight.c                 |  2 +-
 drivers/video/raydium-rm68200.c               |  4 +--
 drivers/video/rockchip/rk3288_hdmi.c          |  2 +-
 drivers/video/rockchip/rk3288_mipi.c          |  2 +-
 drivers/video/rockchip/rk3288_vop.c           |  2 +-
 drivers/video/rockchip/rk3399_hdmi.c          |  2 +-
 drivers/video/rockchip/rk3399_mipi.c          |  2 +-
 drivers/video/rockchip/rk3399_vop.c           |  2 +-
 drivers/video/rockchip/rk_edp.c               |  2 +-
 drivers/video/rockchip/rk_lvds.c              |  2 +-
 drivers/video/sandbox_dsi_host.c              |  2 +-
 drivers/video/sandbox_osd.c                   |  2 +-
 drivers/video/sandbox_sdl.c                   |  2 +-
 drivers/video/simple_panel.c                  |  2 +-
 drivers/video/stm32/stm32_dsi.c               |  2 +-
 drivers/video/stm32/stm32_ltdc.c              |  2 +-
 drivers/video/sunxi/sunxi_dw_hdmi.c           |  2 +-
 drivers/video/sunxi/sunxi_lcd.c               |  2 +-
 drivers/video/tda19988.c                      |  2 +-
 drivers/video/tegra.c                         |  2 +-
 drivers/video/tegra124/dp.c                   |  4 +--
 drivers/video/tegra124/sor.c                  |  2 +-
 drivers/video/vidconsole-uclass.c             |  2 +-
 drivers/video/video-uclass.c                  |  6 ++--
 drivers/virtio/virtio-uclass.c                |  2 +-
 drivers/virtio/virtio_blk.c                   |  2 +-
 drivers/virtio/virtio_mmio.c                  |  2 +-
 drivers/virtio/virtio_net.c                   |  4 +--
 drivers/virtio/virtio_pci_legacy.c            |  2 +-
 drivers/virtio/virtio_pci_modern.c            |  2 +-
 drivers/virtio/virtio_rng.c                   |  2 +-
 drivers/virtio/virtio_sandbox.c               |  4 +--
 drivers/w1/mxc_w1.c                           |  2 +-
 drivers/w1/w1-gpio.c                          |  2 +-
 drivers/w1/w1-uclass.c                        |  4 +--
 drivers/watchdog/armada-37xx-wdt.c            |  2 +-
 drivers/watchdog/ast_wdt.c                    |  2 +-
 drivers/watchdog/at91sam9_wdt.c               |  2 +-
 drivers/watchdog/bcm6345_wdt.c                |  2 +-
 drivers/watchdog/cdns_wdt.c                   |  2 +-
 drivers/watchdog/designware_wdt.c             |  2 +-
 drivers/watchdog/imx_watchdog.c               |  2 +-
 drivers/watchdog/mt7621_wdt.c                 |  2 +-
 drivers/watchdog/mtk_wdt.c                    |  2 +-
 drivers/watchdog/octeontx_wdt.c               |  2 +-
 drivers/watchdog/omap_wdt.c                   |  2 +-
 drivers/watchdog/orion_wdt.c                  |  2 +-
 drivers/watchdog/rti_wdt.c                    |  2 +-
 drivers/watchdog/sbsa_gwdt.c                  |  2 +-
 drivers/watchdog/sp805_wdt.c                  |  2 +-
 drivers/watchdog/stm32mp_wdt.c                |  2 +-
 drivers/watchdog/xilinx_tb_wdt.c              |  2 +-
 drivers/watchdog/xilinx_wwdt.c                |  4 +--
 drivers/xen/pvblock.c                         |  2 +-
 include/dm/device.h                           | 18 ++++++------
 include/dm/uclass.h                           | 20 ++++++-------
 include/dwmmc.h                               |  2 +-
 include/sdhci.h                               |  2 +-
 include/spi.h                                 |  2 +-
 lib/efi_driver/efi_block_device.c             |  2 +-
 net/eth-uclass.c                              |  4 +--
 net/mdio-mux-uclass.c                         |  4 +--
 net/mdio-uclass.c                             |  2 +-
 test/dm/acpi.c                                |  2 +-
 test/dm/bus.c                                 | 28 +++++++++----------
 test/dm/core.c                                |  2 +-
 test/dm/mux-emul.c                            |  2 +-
 test/dm/regmap.c                              |  2 +-
 test/dm/test-driver.c                         |  4 +--
 test/dm/test-fdt.c                            | 14 +++++-----
 test/dm/test-uclass.c                         |  6 ++--
 955 files changed, 1364 insertions(+), 1368 deletions(-)

Applied to u-boot-dm/next, thanks!
diff mbox series

Patch

diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c
index 31ae9719e82..17f6397bee1 100644
--- a/arch/arm/mach-ipq40xx/clock-ipq4019.c
+++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c
@@ -78,6 +78,6 @@  U_BOOT_DRIVER(clk_msm) = {
 	.id		= UCLASS_CLK,
 	.of_match	= msm_clk_ids,
 	.ops		= &msm_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct msm_clk_priv),
+	.priv_auto	= sizeof(struct msm_clk_priv),
 	.probe		= msm_clk_probe,
 };
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 64b8b049fa1..c51a75ee94b 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -131,7 +131,7 @@  U_BOOT_DRIVER(pinctrl_snapdraon) = {
 	.name		= "pinctrl_msm",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= msm_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct msm_pinctrl_priv),
+	.priv_auto	= sizeof(struct msm_pinctrl_priv),
 	.ops		= &msm_pinctrl_ops,
 	.probe		= msm_pinctrl_probe,
 };
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
index 69d65c82e3e..fbe0b5212f9 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.c
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -143,6 +143,6 @@  U_BOOT_DRIVER(clk_msm) = {
 	.id		= UCLASS_CLK,
 	.of_match	= msm_clk_ids,
 	.ops		= &msm_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct msm_clk_priv),
+	.priv_auto	= sizeof(struct msm_clk_priv),
 	.probe		= msm_clk_probe,
 };
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index 4c2af213082..e6b87c35732 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -123,7 +123,7 @@  U_BOOT_DRIVER(pinctrl_snapdraon) = {
 	.name		= "pinctrl_msm",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= msm_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct msm_pinctrl_priv),
+	.priv_auto	= sizeof(struct msm_pinctrl_priv),
 	.ops		= &msm_pinctrl_ops,
 	.probe		= msm_pinctrl_probe,
 };
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index a9b9bd09027..cb9208981e7 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -513,7 +513,7 @@  U_BOOT_DRIVER(stm32mp_bsec) = {
 	.id = UCLASS_MISC,
 	.of_match = stm32mp_bsec_ids,
 	.ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct stm32mp_bsec_platdata),
+	.platdata_auto	= sizeof(struct stm32mp_bsec_platdata),
 	.ops = &stm32mp_bsec_ops,
 	.probe = stm32mp_bsec_probe,
 };
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index 900dee4c38a..7985049f9b1 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -104,7 +104,7 @@  U_BOOT_DRIVER(stm32mp_pwr_pmic) = {
 	.bind = stm32mp_pwr_bind,
 	.ops = &stm32mp_pwr_ops,
 	.ofdata_to_platdata = stm32mp_pwr_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct stm32mp_pwr_priv),
+	.priv_auto	= sizeof(struct stm32mp_pwr_priv),
 };
 
 static const struct stm32mp_pwr_reg_info stm32mp_pwr_reg11 = {
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 70badb15a3b..6ff80e5d312 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -108,5 +108,5 @@  U_BOOT_DRIVER(acpi_gpe_drv) = {
 	.of_match	= acpi_gpe_ids,
 	.ops		= &acpi_gpe_ops,
 	.ofdata_to_platdata	= acpi_gpe_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct acpi_gpe_priv),
+	.priv_auto	= sizeof(struct acpi_gpe_priv),
 };
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index cafd9d65b24..4b627e325ec 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -403,7 +403,7 @@  U_BOOT_DRIVER(intel_apl_hostbridge) = {
 	.ofdata_to_platdata = apl_hostbridge_ofdata_to_platdata,
 	.probe		= apl_hostbridge_probe,
 	.remove		= apl_hostbridge_remove,
-	.platdata_auto_alloc_size = sizeof(struct apl_hostbridge_platdata),
+	.platdata_auto	= sizeof(struct apl_hostbridge_platdata),
 	ACPI_OPS_PTR(&apl_hostbridge_acpi_ops)
 	.flags		= DM_FLAG_OS_PREPARE,
 };
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index cacaa007e05..82e2187c505 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -224,5 +224,5 @@  U_BOOT_DRIVER(intel_apl_pmc) = {
 	.ofdata_to_platdata = apl_pmc_ofdata_to_uc_platdata,
 	.probe		= apl_pmc_probe,
 	.ops		= &apl_pmc_ops,
-	.platdata_auto_alloc_size = sizeof(struct apl_pmc_platdata),
+	.platdata_auto	= sizeof(struct apl_pmc_platdata),
 };
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 089b37c59f8..324dd6c9f1b 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -125,7 +125,7 @@  U_BOOT_DRIVER(winbond_w25q128fw) = {
 	.of_match	= apl_flash_ids,
 	.bind		= apl_flash_bind,
 	.probe		= apl_flash_probe,
-	.priv_auto_alloc_size = sizeof(struct spi_flash),
+	.priv_auto	= sizeof(struct spi_flash),
 	.ops		= &apl_flash_ops,
 };
 
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index c522aa97803..6695234dce7 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -126,8 +126,8 @@  U_BOOT_DRIVER(intel_apl_ns16550) = {
 	.name	= "intel_apl_ns16550",
 	.id	= UCLASS_SERIAL,
 	.of_match = apl_ns16550_serial_ids,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
 	.ops	= &ns16550_serial_ops,
 	.ofdata_to_platdata = apl_ns16550_ofdata_to_platdata,
 	.probe = apl_ns16550_probe,
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index ff066028fe6..ea9e98dde69 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -665,6 +665,6 @@  U_BOOT_DRIVER(cpu_x86_broadwell_drv) = {
 	.bind		= cpu_x86_bind,
 	.probe		= cpu_x86_broadwell_probe,
 	.ops		= &cpu_x86_broadwell_ops,
-	.priv_auto_alloc_size	= sizeof(struct cpu_broadwell_priv),
+	.priv_auto	= sizeof(struct cpu_broadwell_priv),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 641da515c8f..a31f5234220 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -266,5 +266,5 @@  U_BOOT_DRIVER(ahci_broadwell_drv) = {
 	.of_match	= broadwell_ahci_ids,
 	.ofdata_to_platdata	= broadwell_sata_ofdata_to_platdata,
 	.probe		= broadwell_sata_probe,
-	.platdata_auto_alloc_size	 = sizeof(struct sata_platdata),
+	.platdata_auto	 = sizeof(struct sata_platdata),
 };
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index de17b93ed43..ed0dad320e1 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -242,6 +242,6 @@  U_BOOT_DRIVER(intel_itss) = {
 	.ops		= &itss_ops,
 	.bind		= itss_bind,
 	.ofdata_to_platdata = itss_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct itss_platdata),
-	.priv_auto_alloc_size = sizeof(struct itss_priv),
+	.platdata_auto	= sizeof(struct itss_platdata),
+	.priv_auto	= sizeof(struct itss_priv),
 };
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index a0a4001e03b..40de1d34a3d 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -197,8 +197,8 @@  U_BOOT_DRIVER(intel_p2sb) = {
 	.remove		= p2sb_remove,
 	.ops		= &p2sb_ops,
 	.ofdata_to_platdata = p2sb_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct p2sb_platdata),
-	.per_child_platdata_auto_alloc_size =
+	.platdata_auto	= sizeof(struct p2sb_platdata),
+	.per_child_platdata_auto	=
 		sizeof(struct p2sb_child_platdata),
 	.child_post_bind = p2sb_child_post_bind,
 	.flags		= DM_FLAG_OS_PREPARE,
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 836a0e8b86e..8b53b96822d 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -362,5 +362,5 @@  U_BOOT_DRIVER(irq_router_drv) = {
 	.id		= UCLASS_IRQ,
 	.of_match	= irq_router_ids,
 	.probe		= irq_router_probe,
-	.priv_auto_alloc_size = sizeof(struct irq_router),
+	.priv_auto	= sizeof(struct irq_router),
 };
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 9813f7977b5..5ffce9835d0 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -58,8 +58,8 @@  U_BOOT_DRIVER(serial_slimbootloader) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = slimbootloader_serial_ids,
 	.ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe	= ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 };
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 5b0e106011a..acf97e3af51 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -191,5 +191,5 @@  U_BOOT_DRIVER(tangier_pinctrl) = {
 	.id = UCLASS_SYSCON,
 	.of_match = tangier_pinctrl_match,
 	.probe = tangier_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mrfld_pinctrl),
+	.priv_auto	= sizeof(struct mrfld_pinctrl),
 };
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 3cd7b1f536e..083aec8d8dd 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -113,5 +113,5 @@  U_BOOT_DRIVER(intel_mid_pmu) = {
 	.id		= UCLASS_SYSCON,
 	.of_match	= pmu_mid_match,
 	.probe		= pmu_mid_probe,
-	.priv_auto_alloc_size = sizeof(struct pmu_mid),
+	.priv_auto	= sizeof(struct pmu_mid),
 };
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index d29d701631d..90ef239bcd3 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -227,5 +227,5 @@  U_BOOT_DRIVER(scu_ipc) = {
 	.id		= UCLASS_SYSCON,
 	.of_match	= scu_ipc_match,
 	.probe		= scu_ipc_probe,
-	.priv_auto_alloc_size = sizeof(struct scu),
+	.priv_auto	= sizeof(struct scu),
 };
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index a20a34a92a8..e3fa3526b75 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -188,5 +188,5 @@  U_BOOT_DRIVER(sysreset_renesas_ulcb) = {
 	.ops		= &renesas_ulcb_sysreset,
 	.probe		= renesas_ulcb_sysreset_probe,
 	.of_match	= renesas_ulcb_sysreset_ids,
-	.priv_auto_alloc_size = sizeof(struct renesas_ulcb_sysreset_priv),
+	.priv_auto	= sizeof(struct renesas_ulcb_sysreset_priv),
 };
diff --git a/common/usb_hub.c b/common/usb_hub.c
index e578f0be284..36bf2abfeec 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -958,9 +958,9 @@  UCLASS_DRIVER(usb_hub) = {
 	.post_bind	= dm_scan_fdt_dev,
 	.post_probe	= usb_hub_post_probe,
 	.child_pre_probe	= usb_child_pre_probe,
-	.per_child_auto_alloc_size = sizeof(struct usb_device),
-	.per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
-	.per_device_auto_alloc_size = sizeof(struct usb_hub_device),
+	.per_child_auto	= sizeof(struct usb_device),
+	.per_child_platdata_auto	= sizeof(struct usb_dev_platdata),
+	.per_device_auto	= sizeof(struct usb_hub_device),
 };
 
 static const struct usb_device_id hub_id_table[] = {
diff --git a/common/usb_storage.c b/common/usb_storage.c
index ff254419951..4c8ad1be6d9 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1529,7 +1529,7 @@  U_BOOT_DRIVER(usb_mass_storage) = {
 	.of_match = usb_mass_storage_ids,
 	.probe = usb_mass_storage_probe,
 #if CONFIG_IS_ENABLED(BLK)
-	.platdata_auto_alloc_size	= sizeof(struct us_data),
+	.platdata_auto	= sizeof(struct us_data),
 #endif
 };
 
diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst
index 2db00e660e1..5c93d0a3f05 100644
--- a/doc/driver-model/design.rst
+++ b/doc/driver-model/design.rst
@@ -448,10 +448,10 @@  The easiest way to make this work it to add a few members to the driver:
 
 .. code-block:: c
 
-	.platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
+	.platdata_auto = sizeof(struct dm_test_pdata),
 	.ofdata_to_platdata = testfdt_ofdata_to_platdata,
 
-The 'auto_alloc' feature allowed space for the platdata to be allocated
+The 'auto' feature allowed space for the platdata to be allocated
 and zeroed before the driver's ofdata_to_platdata() method is called. The
 ofdata_to_platdata() method, which the driver write supplies, should parse
 the device tree node for this device and place it in dev->platdata. Thus
@@ -464,7 +464,7 @@  probe method it will be called next. See Driver Lifecycle below for more
 details.
 
 If you don't want to have the platdata automatically allocated then you
-can leave out platdata_auto_alloc_size. In this case you can use malloc
+can leave out platdata_auto. In this case you can use malloc
 in your ofdata_to_platdata (or probe) method to allocate the required memory,
 and you should free it in the remove method.
 
@@ -604,7 +604,7 @@  as the bus speed for each device.
 
 To achieve this, the bus device can use dev->parent_platdata in each of its
 three children. This can be auto-allocated if the bus driver (or bus uclass)
-has a non-zero value for per_child_platdata_auto_alloc_size. If not, then
+has a non-zero value for per_child_platdata_auto. If not, then
 the bus device or uclass can allocate the space itself before the child
 device is probed.
 
@@ -714,24 +714,24 @@  platdata. A parent's ofdata is always read before a child.
 
 The steps are:
 
-   1. If priv_auto_alloc_size is non-zero, then the device-private space
+   1. If priv_auto is non-zero, then the device-private space
    is allocated for the device and zeroed. It will be accessible as
    dev->priv. The driver can put anything it likes in there, but should use
    it for run-time information, not platform data (which should be static
    and known before the device is probed).
 
-   2. If platdata_auto_alloc_size is non-zero, then the platform data space
+   2. If platdata_auto is non-zero, then the platform data space
    is allocated. This is only useful for device tree operation, since
    otherwise you would have to specific the platform data in the
    U_BOOT_DEVICE() declaration. The space is allocated for the device and
    zeroed. It will be accessible as dev->platdata.
 
-   3. If the device's uclass specifies a non-zero per_device_auto_alloc_size,
+   3. If the device's uclass specifies a non-zero per_device_auto,
    then this space is allocated and zeroed also. It is allocated for and
    stored in the device, but it is uclass data. owned by the uclass driver.
    It is possible for the device to access it.
 
-   4. If the device's immediate parent specifies a per_child_auto_alloc_size
+   4. If the device's immediate parent specifies a per_child_auto
    then this space is allocated. This is intended for use by the parent
    device to keep track of things related to the child. For example a USB
    flash stick attached to a USB host controller would likely use this
@@ -745,7 +745,7 @@  The steps are:
    works the same way whether it was bound using a device tree node or
    U_BOOT_DEVICE() structure. In either case, the platform data is now stored
    in the platdata structure. Typically you will use the
-   platdata_auto_alloc_size feature to specify the size of the platform data
+   platdata_auto feature to specify the size of the platform data
    structure, and U-Boot will automatically allocate and zero it for you before
    entry to ofdata_to_platdata(). But if not, you can allocate it yourself in
    ofdata_to_platdata(). Note that it is preferable to do all the device tree
@@ -810,9 +810,9 @@  as above and then following these steps (see device_probe()):
       - uclass data in dev->uclass_priv (for things the uclass stores
         about this device)
 
-   Note: If you don't use priv_auto_alloc_size then you will need to
+   Note: If you don't use priv_auto then you will need to
    allocate the priv space here yourself. The same applies also to
-   platdata_auto_alloc_size. Remember to free them in the remove() method.
+   platdata_auto. Remember to free them in the remove() method.
 
    3. The device is marked 'activated'
 
@@ -858,10 +858,10 @@  remove it. This performs the probe steps in reverse:
    be dynamically allocated, and thus needs to be deallocated during the
    remove() method, either:
 
-      - if the platdata_auto_alloc_size is non-zero, the deallocation
+      - if the platdata_auto is non-zero, the deallocation
         happens automatically within the driver model core; or
 
-      - when platdata_auto_alloc_size is 0, both the allocation (in probe()
+      - when platdata_auto is 0, both the allocation (in probe()
         or preferably ofdata_to_platdata()) and the deallocation in remove()
         are the responsibility of the driver author.
 
diff --git a/doc/driver-model/ethernet.rst b/doc/driver-model/ethernet.rst
index 1f5310daaa0..781644d2e27 100644
--- a/doc/driver-model/ethernet.rst
+++ b/doc/driver-model/ethernet.rst
@@ -28,14 +28,14 @@  the UCLASS_ETH .id field in the U-Boot driver struct:
 		.ofdata_to_platdata	= eth_ape_ofdata_to_platdata,
 		.probe			= eth_ape_probe,
 		.ops			= &eth_ape_ops,
-		.priv_auto_alloc_size	= sizeof(struct eth_ape_priv),
-		.platdata_auto_alloc_size = sizeof(struct eth_ape_pdata),
+		.priv_auto	= sizeof(struct eth_ape_priv),
+		.platdata_auto = sizeof(struct eth_ape_pdata),
 		.flags			= DM_FLAG_ALLOC_PRIV_DMA,
 	};
 
 struct eth_ape_priv contains runtime per-instance data, like buffers, pointers
 to current descriptors, current speed settings, pointers to PHY related data
-(like struct mii_dev) and so on. Declaring its size in .priv_auto_alloc_size
+(like struct mii_dev) and so on. Declaring its size in .priv_auto
 will let the driver framework allocate it at the right time.
 It can be retrieved using a dev_get_priv(dev) call.
 
@@ -43,7 +43,7 @@  struct eth_ape_pdata contains static platform data, like the MMIO base address,
 a hardware variant, the MAC address. ``struct eth_pdata eth_pdata``
 as the first member of this struct helps to avoid duplicated code.
 If you don't need any more platform data beside the standard member,
-just use sizeof(struct eth_pdata) for the platdata_auto_alloc_size.
+just use sizeof(struct eth_pdata) for the platdata_auto.
 
 PCI devices add a line pointing to supported vendor/device ID pairs:
 
diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst
index 58481665cec..2df59edb7cc 100644
--- a/doc/driver-model/of-plat.rst
+++ b/doc/driver-model/of-plat.rst
@@ -293,8 +293,8 @@  For example:
             .of_match       = mmc_ids,
             .ofdata_to_platdata = mmc_ofdata_to_platdata,
             .probe          = mmc_probe,
-            .priv_auto_alloc_size = sizeof(struct mmc_priv),
-            .platdata_auto_alloc_size = sizeof(struct mmc_platdata),
+            .priv_auto = sizeof(struct mmc_priv),
+            .platdata_auto = sizeof(struct mmc_platdata),
     };
 
     U_BOOT_DRIVER_ALIAS(mmc_drv, vendor_mmc) /* matches compatible string */
@@ -305,7 +305,7 @@  keep the use of each of-platdata struct to the smallest possible code area.
 There is just one driver C file for each struct, that can convert from the
 of-platdata struct to the standard one used by the driver.
 
-In the case where SPL_OF_PLATDATA is enabled, platdata_auto_alloc_size is
+In the case where SPL_OF_PLATDATA is enabled, platdata_auto is
 still used to allocate space for the platform data. This is different from
 the normal behaviour and is triggered by the use of of-platdata (strictly
 speaking it is a non-zero platdata_size which triggers this).
diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst
index 9631a5059d3..a12d6922e55 100644
--- a/doc/driver-model/spi-howto.rst
+++ b/doc/driver-model/spi-howto.rst
@@ -231,7 +231,7 @@  tree, but we need to tell it the size:
 
 	U_BOOT_DRIVER(spi_exynos) = {
 	...
-		.platdata_auto_alloc_size = sizeof(struct exynos_spi_platdata),
+		.platdata_auto = sizeof(struct exynos_spi_platdata),
 
 
 Here is a sample function. It gets a pointer to the platform data and
@@ -335,7 +335,7 @@  DM can auto-allocate this also:
 
 	U_BOOT_DRIVER(spi_exynos) = {
 	...
-		.priv_auto_alloc_size = sizeof(struct exynos_spi_priv),
+		.priv_auto = sizeof(struct exynos_spi_priv),
 
 
 Note that this is created before the probe method is called, and destroyed
@@ -621,7 +621,7 @@  needs, but this is the minimum.
 
 	U_BOOT_DRIVER(exynos_spi) = {
 	...
-		.per_child_auto_alloc_size	= sizeof(struct spi_slave),
+		.per_child_auto	= sizeof(struct spi_slave),
 	}
 
 
diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst
index 1817df420fb..5f7cbfce097 100644
--- a/doc/driver-model/usb-info.rst
+++ b/doc/driver-model/usb-info.rst
@@ -43,8 +43,8 @@  as drivers in the USB uclass. For example:
 		.probe = tegra_ehci_usb_probe,
 		.remove = tegra_ehci_usb_remove,
 		.ops	= &ehci_usb_ops,
-		.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-		.priv_auto_alloc_size = sizeof(struct fdt_usb),
+		.platdata_auto = sizeof(struct usb_platdata),
+		.priv_auto = sizeof(struct fdt_usb),
 		.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 	};
 
@@ -58,7 +58,7 @@  The ops here are ehci_usb_ops. All EHCI drivers will use these same ops in
 most cases, since they are all EHCI-compatible. For EHCI there are also some
 special operations that can be overridden when calling ehci_register().
 
-The driver can use priv_auto_alloc_size to set the size of its private data.
+The driver can use priv_auto to set the size of its private data.
 This can hold run-time information needed by the driver for operation. It
 exists when the device is probed (not when it is bound) and is removed when
 the driver is removed.
diff --git a/doc/imx/clk/ccf.txt b/doc/imx/clk/ccf.txt
index e40ac360e86..f47ca8832de 100644
--- a/doc/imx/clk/ccf.txt
+++ b/doc/imx/clk/ccf.txt
@@ -37,7 +37,7 @@  Design decisions:
   modify clk-uclass.c file and add there struct uc_clk_priv, which would have
   clock related members (like pointer to clk). As of this writing there is no
   such need, so to avoid extra allocations (as it can be auto allocated by
-  setting .per_device_auto_alloc_size = sizeof(struct uc_clk_priv)) the
+  setting .per_device_auto = sizeof(struct uc_clk_priv)) the
   uclass_priv stores the pointer to struct clk.
 
 * Non-CCF clocks do not have a pointer to a clock in clk->dev->priv. In the case
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index d4356672581..7d0c8579478 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -437,5 +437,5 @@  UCLASS_DRIVER(adc) = {
 	.id	= UCLASS_ADC,
 	.name	= "adc",
 	.pre_probe =  adc_pre_probe,
-	.per_device_platdata_auto_alloc_size = ADC_UCLASS_PLATDATA_SIZE,
+	.per_device_platdata_auto	= ADC_UCLASS_PLATDATA_SIZE,
 };
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index b459b570507..6bdc45a5fc0 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -140,5 +140,5 @@  U_BOOT_DRIVER(exynos_adc) = {
 	.ops		= &exynos_adc_ops,
 	.probe		= exynos_adc_probe,
 	.ofdata_to_platdata = exynos_adc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct exynos_adc_priv),
+	.priv_auto	= sizeof(struct exynos_adc_priv),
 };
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index 72b0cc4e5bd..469ab1f178d 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -721,5 +721,5 @@  U_BOOT_DRIVER(meson_saradc) = {
 	.ops		= &meson_saradc_ops,
 	.probe		= meson_saradc_probe,
 	.ofdata_to_platdata = meson_saradc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct meson_saradc_priv),
+	.priv_auto	= sizeof(struct meson_saradc_priv),
 };
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 561740f63b5..1e127209746 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -180,5 +180,5 @@  U_BOOT_DRIVER(rockchip_saradc) = {
 	.ops		= &rockchip_saradc_ops,
 	.probe		= rockchip_saradc_probe,
 	.ofdata_to_platdata = rockchip_saradc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct rockchip_saradc_priv),
+	.priv_auto	= sizeof(struct rockchip_saradc_priv),
 };
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index 1f32289f603..14f2c2a7ed0 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -169,5 +169,5 @@  U_BOOT_DRIVER(sandbox_adc) = {
 	.ops		= &sandbox_adc_ops,
 	.probe		= sandbox_adc_probe,
 	.ofdata_to_platdata = sandbox_adc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct sandbox_adc_priv),
+	.priv_auto	= sizeof(struct sandbox_adc_priv),
 };
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index f20c46fb36c..6c176961f17 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -209,5 +209,5 @@  U_BOOT_DRIVER(stm32_adc_core) = {
 	.id = UCLASS_SIMPLE_BUS,
 	.of_match = stm32_adc_core_ids,
 	.probe = stm32_adc_core_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_adc_common),
+	.priv_auto	= sizeof(struct stm32_adc_common),
 };
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index 3f0ed48846c..2c6984f2aa3 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -258,5 +258,5 @@  U_BOOT_DRIVER(stm32_adc) = {
 	.of_match = stm32_adc_ids,
 	.probe = stm32_adc_probe,
 	.ops = &stm32_adc_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_adc),
+	.priv_auto	= sizeof(struct stm32_adc),
 };
diff --git a/drivers/ata/ahci-uclass.c b/drivers/ata/ahci-uclass.c
index 42bbff962bc..c4c7a03fe74 100644
--- a/drivers/ata/ahci-uclass.c
+++ b/drivers/ata/ahci-uclass.c
@@ -11,5 +11,5 @@ 
 UCLASS_DRIVER(ahci) = {
 	.id		= UCLASS_AHCI,
 	.name		= "ahci",
-	.per_device_auto_alloc_size = sizeof(struct ahci_uc_priv),
+	.per_device_auto	= sizeof(struct ahci_uc_priv),
 };
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index ed0527c9768..a865bcbcf9e 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -95,5 +95,5 @@  U_BOOT_DRIVER(dwc_ahci) = {
 	.ofdata_to_platdata = dwc_ahci_ofdata_to_platdata,
 	.ops	= &scsi_ops,
 	.probe	= dwc_ahci_probe,
-	.priv_auto_alloc_size = sizeof(struct dwc_ahci_priv),
+	.priv_auto	= sizeof(struct dwc_ahci_priv),
 };
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 8c6726a6214..8e4f382fd18 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -900,7 +900,7 @@  U_BOOT_DRIVER(sata_fsl_driver) = {
 	.name = "sata_fsl_blk",
 	.id = UCLASS_BLK,
 	.ops = &sata_fsl_blk_ops,
-	.platdata_auto_alloc_size = sizeof(struct fsl_ata_priv),
+	.platdata_auto	= sizeof(struct fsl_ata_priv),
 };
 
 static int fsl_ata_ofdata_to_platdata(struct udevice *dev)
@@ -1029,6 +1029,6 @@  U_BOOT_DRIVER(fsl_ahci) = {
 	.ofdata_to_platdata = fsl_ata_ofdata_to_platdata,
 	.probe	= fsl_ata_probe,
 	.remove = fsl_ata_remove,
-	.priv_auto_alloc_size = sizeof(struct fsl_ata_priv),
+	.priv_auto	= sizeof(struct fsl_ata_priv),
 };
 #endif
diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
index 4ad260a5bb9..ac7fa493b2f 100644
--- a/drivers/ata/mtk_ahci.c
+++ b/drivers/ata/mtk_ahci.c
@@ -124,5 +124,5 @@  U_BOOT_DRIVER(mtk_ahci) = {
 	.ofdata_to_platdata = mtk_ahci_ofdata_to_platdata,
 	.ops	= &scsi_ops,
 	.probe	= mtk_ahci_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_ahci_priv),
+	.priv_auto	= sizeof(struct mtk_ahci_priv),
 };
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index 77508aa5bc7..9a77725ae61 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -233,7 +233,7 @@  U_BOOT_DRIVER(ceva_host_blk) = {
 	.of_match = sata_ceva_ids,
 	.bind = sata_ceva_bind,
 	.ops = &scsi_ops,
-	.priv_auto_alloc_size = sizeof(struct ceva_sata_priv),
+	.priv_auto	= sizeof(struct ceva_sata_priv),
 	.probe = sata_ceva_probe,
 	.ofdata_to_platdata = sata_ceva_ofdata_to_platdata,
 };
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b2b5c699ad1..b49bd5c5450 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1030,7 +1030,7 @@  U_BOOT_DRIVER(sata_mv_driver) = {
 	.name = "sata_mv_blk",
 	.id = UCLASS_BLK,
 	.ops = &sata_mv_blk_ops,
-	.platdata_auto_alloc_size = sizeof(struct mv_priv),
+	.platdata_auto	= sizeof(struct mv_priv),
 };
 
 static int sata_mv_probe(struct udevice *dev)
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index d5ba94c1725..4d83f756b2b 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -772,7 +772,7 @@  U_BOOT_DRIVER(sata_sil_driver) = {
 	.name = "sata_sil_blk",
 	.id = UCLASS_BLK,
 	.ops = &sata_sil_blk_ops,
-	.platdata_auto_alloc_size = sizeof(struct sil_sata_priv),
+	.platdata_auto	= sizeof(struct sil_sata_priv),
 };
 
 static int sil_unbind_device(struct udevice *dev)
@@ -920,7 +920,7 @@  U_BOOT_DRIVER(sil_ahci_pci) = {
 	.ops = &sata_sil_ops,
 	.probe = sil_pci_probe,
 	.remove = sil_pci_remove,
-	.priv_auto_alloc_size = sizeof(struct sil_sata_priv),
+	.priv_auto	= sizeof(struct sil_sata_priv),
 };
 
 U_BOOT_PCI_DEVICE(sil_ahci_pci, supported);
diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c
index 39455110907..a7e9761fbfc 100644
--- a/drivers/axi/ihs_axi.c
+++ b/drivers/axi/ihs_axi.c
@@ -291,6 +291,6 @@  U_BOOT_DRIVER(ihs_axi_bus) = {
 	.id             = UCLASS_AXI,
 	.of_match       = ihs_axi_ids,
 	.ops		= &ihs_axi_ops,
-	.priv_auto_alloc_size = sizeof(struct ihs_axi_priv),
+	.priv_auto	= sizeof(struct ihs_axi_priv),
 	.probe          = ihs_axi_probe,
 };
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 42bcae6af26..ef349a50b79 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -119,7 +119,7 @@  U_BOOT_DRIVER(sandbox_axi_store) = {
 	.id             = UCLASS_AXI_EMUL,
 	.of_match       = sandbox_store_ids,
 	.ops		= &sandbox_store_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_store_priv),
+	.priv_auto	= sizeof(struct sandbox_store_priv),
 	.probe          = sandbox_store_probe,
 	.remove		= sandbox_store_remove,
 };
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 2fb9f6b765e..714e5d769c3 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -660,5 +660,5 @@  UCLASS_DRIVER(blk) = {
 	.id		= UCLASS_BLK,
 	.name		= "blk",
 	.post_probe	= blk_post_probe,
-	.per_device_platdata_auto_alloc_size = sizeof(struct blk_desc),
+	.per_device_platdata_auto	= sizeof(struct blk_desc),
 };
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index cca2237136a..e5ef260cf2b 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -228,7 +228,7 @@  U_BOOT_DRIVER(sandbox_host_blk) = {
 	.name		= "sandbox_host_blk",
 	.id		= UCLASS_BLK,
 	.ops		= &sandbox_host_blk_ops,
-	.platdata_auto_alloc_size = sizeof(struct host_block_dev),
+	.platdata_auto	= sizeof(struct host_block_dev),
 };
 #else
 U_BOOT_LEGACY_BLK(sandbox_host) = {
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index e8db8542f93..343b8a34414 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -136,7 +136,7 @@  static const struct udevice_id bootcount_mem_ids[] = {
 U_BOOT_DRIVER(bootcount_mem) = {
 	.name	= "bootcount-mem",
 	.id	= UCLASS_BOOTCOUNT,
-	.priv_auto_alloc_size = sizeof(struct bootcount_mem_priv),
+	.priv_auto	= sizeof(struct bootcount_mem_priv),
 	.probe	= bootcount_mem_probe,
 	.of_match = bootcount_mem_ids,
 	.ops	= &bootcount_mem_ops,
diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c
index a3aa0cf5595..709be094b11 100644
--- a/drivers/bootcount/i2c-eeprom.c
+++ b/drivers/bootcount/i2c-eeprom.c
@@ -89,7 +89,7 @@  static const struct udevice_id bootcount_i2c_eeprom_ids[] = {
 U_BOOT_DRIVER(bootcount_spi_flash) = {
 	.name	= "bootcount-i2c-eeprom",
 	.id	= UCLASS_BOOTCOUNT,
-	.priv_auto_alloc_size = sizeof(struct bootcount_i2c_eeprom_priv),
+	.priv_auto	= sizeof(struct bootcount_i2c_eeprom_priv),
 	.probe	= bootcount_i2c_eeprom_probe,
 	.of_match = bootcount_i2c_eeprom_ids,
 	.ops	= &bootcount_i2c_eeprom_ops,
diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c
index 076a8bb2be8..483caaa80df 100644
--- a/drivers/bootcount/rtc.c
+++ b/drivers/bootcount/rtc.c
@@ -83,7 +83,7 @@  static const struct udevice_id bootcount_rtc_ids[] = {
 U_BOOT_DRIVER(bootcount_rtc) = {
 	.name	= "bootcount-rtc",
 	.id	= UCLASS_BOOTCOUNT,
-	.priv_auto_alloc_size = sizeof(struct bootcount_rtc_priv),
+	.priv_auto	= sizeof(struct bootcount_rtc_priv),
 	.probe	= bootcount_rtc_probe,
 	.of_match = bootcount_rtc_ids,
 	.ops	= &bootcount_rtc_ops,
diff --git a/drivers/bootcount/spi-flash.c b/drivers/bootcount/spi-flash.c
index 7cd388e6616..03050e66613 100644
--- a/drivers/bootcount/spi-flash.c
+++ b/drivers/bootcount/spi-flash.c
@@ -118,7 +118,7 @@  static const struct udevice_id bootcount_spi_flash_ids[] = {
 U_BOOT_DRIVER(bootcount_spi_flash) = {
 	.name	= "bootcount-spi-flash",
 	.id	= UCLASS_BOOTCOUNT,
-	.priv_auto_alloc_size = sizeof(struct bootcount_spi_flash_priv),
+	.priv_auto	= sizeof(struct bootcount_spi_flash_priv),
 	.probe	= bootcount_spi_flash_probe,
 	.of_match = bootcount_spi_flash_ids,
 	.ops	= &bootcount_spi_flash_ops,
diff --git a/drivers/button/button-gpio.c b/drivers/button/button-gpio.c
index 985ae7f5a76..756cd6972b2 100644
--- a/drivers/button/button-gpio.c
+++ b/drivers/button/button-gpio.c
@@ -105,7 +105,7 @@  U_BOOT_DRIVER(button_gpio) = {
 	.id		= UCLASS_BUTTON,
 	.of_match	= button_gpio_ids,
 	.ops		= &button_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct button_gpio_priv),
+	.priv_auto	= sizeof(struct button_gpio_priv),
 	.bind		= button_gpio_bind,
 	.probe		= button_gpio_probe,
 	.remove		= button_gpio_remove,
diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c
index 1c742c265cf..133f4dead1a 100644
--- a/drivers/button/button-uclass.c
+++ b/drivers/button/button-uclass.c
@@ -39,5 +39,5 @@  enum button_state_t button_get_state(struct udevice *dev)
 UCLASS_DRIVER(button) = {
 	.id		= UCLASS_BUTTON,
 	.name		= "button",
-	.per_device_platdata_auto_alloc_size = sizeof(struct button_uc_plat),
+	.per_device_platdata_auto	= sizeof(struct button_uc_plat),
 };
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 51c074bfe23..3d33a51e2e1 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -182,7 +182,7 @@  U_BOOT_DRIVER(v5l2_cache) = {
 	.of_match = v5l2_cache_ids,
 	.ofdata_to_platdata = v5l2_ofdata_to_platdata,
 	.probe	= v5l2_probe,
-	.platdata_auto_alloc_size = sizeof(struct v5l2_plat),
+	.platdata_auto	= sizeof(struct v5l2_plat),
 	.ops = &v5l2_cache_ops,
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index a539889d5be..8a71e2f8a1d 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -658,5 +658,5 @@  U_BOOT_DRIVER(socfpga_agilex_clk) = {
 	.ops		= &socfpga_clk_ops,
 	.probe		= socfpga_clk_probe,
 	.ofdata_to_platdata = socfpga_clk_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct socfpga_clk_platdata),
+	.platdata_auto	= sizeof(struct socfpga_clk_platdata),
 };
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 732ed4d79b9..1d853cd3003 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -359,5 +359,5 @@  U_BOOT_DRIVER(socfpga_a10_clk) = {
 	.probe		= socfpga_a10_clk_probe,
 	.ofdata_to_platdata = socfpga_a10_ofdata_to_platdata,
 
-	.platdata_auto_alloc_size = sizeof(struct socfpga_a10_clk_platdata),
+	.platdata_auto	= sizeof(struct socfpga_a10_clk_platdata),
 };
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index aab7d14deb7..e2e8d49b655 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -523,7 +523,7 @@  U_BOOT_DRIVER(aspeed_ast2500_scu) = {
 	.name		= "aspeed_ast2500_scu",
 	.id		= UCLASS_CLK,
 	.of_match	= ast2500_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct ast2500_clk_priv),
+	.priv_auto	= sizeof(struct ast2500_clk_priv),
 	.ops		= &ast2500_clk_ops,
 	.bind		= ast2500_clk_bind,
 	.ofdata_to_platdata		= ast2500_clk_ofdata_to_platdata,
diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c
index afd67b290d8..1b437117668 100644
--- a/drivers/clk/at91/compat.c
+++ b/drivers/clk/at91/compat.c
@@ -225,7 +225,7 @@  U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = main_osc_clk_match,
 	.probe = main_osc_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &main_osc_clk_ops,
 };
 
@@ -266,7 +266,7 @@  U_BOOT_DRIVER(at91_plla_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = plla_clk_match,
 	.probe = plla_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &plla_clk_ops,
 };
 
@@ -340,7 +340,7 @@  U_BOOT_DRIVER(at91_plladiv_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = at91_plladiv_clk_match,
 	.probe = at91_plladiv_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &at91_plladiv_clk_ops,
 };
 
@@ -437,7 +437,7 @@  U_BOOT_DRIVER(system_clk) = {
 	.name = "system-clk",
 	.id = UCLASS_CLK,
 	.probe = at91_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &system_clk_ops,
 };
 
@@ -536,7 +536,7 @@  static struct clk_ops periph_clk_ops = {
 U_BOOT_DRIVER(clk_periph) = {
 	.name	= "periph-clk",
 	.id	= UCLASS_CLK,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.probe = at91_clk_probe,
 	.ops	= &periph_clk_ops,
 };
@@ -668,7 +668,7 @@  U_BOOT_DRIVER(at91sam9x5_utmi_clk) = {
 	.of_match = utmi_clk_match,
 	.probe = utmi_clk_probe,
 	.ofdata_to_platdata = utmi_clk_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &utmi_clk_ops,
 };
 
@@ -713,7 +713,7 @@  U_BOOT_DRIVER(sama5d4_h32mx_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = sama5d4_h32mx_clk_match,
 	.probe = sama5d4_h32mx_clk_probe,
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &sama5d4_h32mx_clk_ops,
 };
 
@@ -876,8 +876,8 @@  U_BOOT_DRIVER(generic_clk) = {
 	.id = UCLASS_CLK,
 	.probe = at91_clk_probe,
 	.ofdata_to_platdata = generic_clk_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct generic_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.priv_auto	= sizeof(struct generic_clk_priv),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &generic_clk_ops,
 };
 
@@ -1012,8 +1012,8 @@  U_BOOT_DRIVER(at91_usb_clk) = {
 	.of_match = at91_usb_clk_match,
 	.probe = at91_usb_clk_probe,
 	.ofdata_to_platdata = at91_usb_clk_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct at91_usb_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct pmc_platdata),
+	.priv_auto	= sizeof(struct at91_usb_clk_priv),
+	.platdata_auto	= sizeof(struct pmc_platdata),
 	.ops = &at91_usb_clk_ops,
 };
 
diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c
index dd62dc5510e..34ce611a98c 100644
--- a/drivers/clk/at91/sckc.c
+++ b/drivers/clk/at91/sckc.c
@@ -165,7 +165,7 @@  U_BOOT_DRIVER(at91_sckc) = {
 	.name = UBOOT_DM_CLK_AT91_SCKC,
 	.id = UCLASS_CLK,
 	.of_match = sam9x60_sckc_ids,
-	.priv_auto_alloc_size = sizeof(struct sam9x60_sckc) * 2,
+	.priv_auto	= sizeof(struct sam9x60_sckc) * 2,
 	.ops = &sam9x60_sckc_ops,
 	.probe = at91_sam9x60_sckc_probe,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c
index fd47872ab99..6634b7b7995 100644
--- a/drivers/clk/clk-cdce9xx.c
+++ b/drivers/clk/clk-cdce9xx.c
@@ -251,6 +251,6 @@  U_BOOT_DRIVER(cdce9xx_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = cdce9xx_clk_of_match,
 	.probe = cdce9xx_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct cdce9xx_clk_data),
+	.priv_auto	= sizeof(struct cdce9xx_clk_data),
 	.ops = &cdce9xx_clk_ops,
 };
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 3eb93a55fc4..449b430e230 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -774,6 +774,6 @@  U_BOOT_DRIVER(hsdk_cgu_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = hsdk_cgu_clk_id,
 	.probe = hsdk_cgu_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct hsdk_cgu_clk),
+	.priv_auto	= sizeof(struct hsdk_cgu_clk),
 	.ops = &hsdk_cgu_ops,
 };
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 7a9a6451374..6f0fdaa111c 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -220,6 +220,6 @@  U_BOOT_DRIVER(ti_sci_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = ti_sci_clk_of_match,
 	.probe = ti_sci_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_clk_data),
+	.priv_auto	= sizeof(struct ti_sci_clk_data),
 	.ops = &ti_sci_clk_ops,
 };
diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c
index b850b9fc069..8c22ed2f43d 100644
--- a/drivers/clk/clk_bcm6345.c
+++ b/drivers/clk/clk_bcm6345.c
@@ -70,5 +70,5 @@  U_BOOT_DRIVER(clk_bcm6345) = {
 	.of_match = bcm6345_clk_ids,
 	.ops = &bcm6345_clk_ops,
 	.probe = bcm63xx_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_clk_priv),
+	.priv_auto	= sizeof(struct bcm6345_clk_priv),
 };
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 2318dcf6a45..99edaec4b52 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -92,6 +92,6 @@  U_BOOT_DRIVER(clk_boston) = {
 	.id = UCLASS_CLK,
 	.of_match = clk_boston_match,
 	.ofdata_to_platdata = clk_boston_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct clk_boston),
+	.platdata_auto	= sizeof(struct clk_boston),
 	.ops = &clk_boston_ops,
 };
diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c
index cf9c4ae367f..4519e0579b0 100644
--- a/drivers/clk/clk_fixed_factor.c
+++ b/drivers/clk/clk_fixed_factor.c
@@ -67,6 +67,6 @@  U_BOOT_DRIVER(clk_fixed_factor) = {
 	.id = UCLASS_CLK,
 	.of_match = clk_fixed_factor_match,
 	.ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct clk_fixed_factor),
+	.platdata_auto	= sizeof(struct clk_fixed_factor),
 	.ops = &clk_fixed_factor_ops,
 };
diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c
index f86b4a0e924..54e5e09b58c 100644
--- a/drivers/clk/clk_fixed_rate.c
+++ b/drivers/clk/clk_fixed_rate.c
@@ -51,7 +51,7 @@  U_BOOT_DRIVER(fixed_clock) = {
 	.id = UCLASS_CLK,
 	.of_match = clk_fixed_rate_match,
 	.ofdata_to_platdata = clk_fixed_rate_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct clk_fixed_rate),
+	.platdata_auto	= sizeof(struct clk_fixed_rate),
 	.ops = &clk_fixed_rate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/clk_octeon.c b/drivers/clk/clk_octeon.c
index fd559e05fc7..ce274549da0 100644
--- a/drivers/clk/clk_octeon.c
+++ b/drivers/clk/clk_octeon.c
@@ -68,5 +68,5 @@  U_BOOT_DRIVER(clk_octeon) = {
 	.of_match = octeon_clk_ids,
 	.ops = &octeon_clk_ops,
 	.probe = octeon_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct octeon_clk_priv),
+	.priv_auto	= sizeof(struct octeon_clk_priv),
 };
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index dc46de2a7cf..5a10d4640d7 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -423,5 +423,5 @@  U_BOOT_DRIVER(pic32_clk) = {
 	.of_match	= pic32_clk_ids,
 	.ops		= &pic32_pic32_clk_ops,
 	.probe		= pic32_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct pic32_clk_priv),
+	.priv_auto	= sizeof(struct pic32_clk_priv),
 };
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index 0ff1b496338..2c6c0e239f7 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -130,7 +130,7 @@  U_BOOT_DRIVER(sandbox_clk) = {
 	.of_match	= sandbox_clk_ids,
 	.ops		= &sandbox_clk_ops,
 	.probe		= sandbox_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_clk_priv),
+	.priv_auto	= sizeof(struct sandbox_clk_priv),
 };
 
 ulong sandbox_clk_query_rate(struct udevice *dev, int id)
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c
index 873383856f9..e9eb738684b 100644
--- a/drivers/clk/clk_sandbox_test.c
+++ b/drivers/clk/clk_sandbox_test.c
@@ -189,5 +189,5 @@  U_BOOT_DRIVER(sandbox_clk_test) = {
 	.id = UCLASS_MISC,
 	.of_match = sandbox_clk_test_ids,
 	.probe = sandbox_clk_test_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_clk_test),
+	.priv_auto	= sizeof(struct sandbox_clk_test),
 };
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 93722f74ae4..7e67895ab79 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -726,6 +726,6 @@  U_BOOT_DRIVER(stm32fx_clk) = {
 	.id			= UCLASS_CLK,
 	.ops			= &stm32_clk_ops,
 	.probe			= stm32_clk_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_clk),
+	.priv_auto	= sizeof(struct stm32_clk),
 	.flags			= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index 5e6abca56fa..842925f43e2 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -868,6 +868,6 @@  U_BOOT_DRIVER(stm32h7_clk) = {
 	.id			= UCLASS_CLK,
 	.ops			= &stm32_clk_ops,
 	.probe			= stm32_clk_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_clk),
+	.priv_auto	= sizeof(struct stm32_clk),
 	.flags			= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index c8840b9e5f1..72cbcdf6a21 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -2332,6 +2332,6 @@  U_BOOT_DRIVER(stm32mp1_clock) = {
 	.name = "stm32mp1_clk",
 	.id = UCLASS_CLK,
 	.ops = &stm32mp1_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32mp1_clk_priv),
+	.priv_auto	= sizeof(struct stm32mp1_clk_priv),
 	.probe = stm32mp1_clk_probe,
 };
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index d93b860aed3..908bc7519c4 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -734,5 +734,5 @@  U_BOOT_DRIVER(versal_clk) = {
 	.of_match = versal_clk_ids,
 	.probe = versal_clk_probe,
 	.ops = &versal_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct versal_clk_priv),
+	.priv_auto	= sizeof(struct versal_clk_priv),
 };
diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c
index b48319bba67..3b1e0208d47 100644
--- a/drivers/clk/clk_vexpress_osc.c
+++ b/drivers/clk/clk_vexpress_osc.c
@@ -107,6 +107,6 @@  U_BOOT_DRIVER(vexpress_osc_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = vexpress_osc_clk_ids,
 	.ops = &vexpress_osc_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct vexpress_osc_clk_priv),
+	.priv_auto	= sizeof(struct vexpress_osc_clk_priv),
 	.probe = vexpress_osc_clk_probe,
 };
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index a699a3664c3..bf32d8317ab 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -485,6 +485,6 @@  U_BOOT_DRIVER(zynq_clk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= zynq_clk_ids,
 	.ops		= &zynq_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct zynq_clk_priv),
+	.priv_auto	= sizeof(struct zynq_clk_priv),
 	.probe		= zynq_clk_probe,
 };
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 77951197566..a9988d8f1a8 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -715,5 +715,5 @@  U_BOOT_DRIVER(zynqmp_clk) = {
 	.of_match = zynqmp_clk_ids,
 	.probe = zynqmp_clk_probe,
 	.ops = &zynqmp_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct zynqmp_clk_priv),
+	.priv_auto	= sizeof(struct zynqmp_clk_priv),
 };
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index 4a023ea736b..7d869eb02b8 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -199,7 +199,7 @@  U_BOOT_DRIVER(exynos7420_clk_topc) = {
 	.id = UCLASS_CLK,
 	.of_match = exynos7420_clk_topc_compat,
 	.probe = exynos7420_clk_topc_probe,
-	.priv_auto_alloc_size = sizeof(struct exynos7420_clk_topc_priv),
+	.priv_auto	= sizeof(struct exynos7420_clk_topc_priv),
 	.ops = &exynos7420_clk_topc_ops,
 };
 
@@ -213,7 +213,7 @@  U_BOOT_DRIVER(exynos7420_clk_top0) = {
 	.id = UCLASS_CLK,
 	.of_match = exynos7420_clk_top0_compat,
 	.probe = exynos7420_clk_top0_probe,
-	.priv_auto_alloc_size = sizeof(struct exynos7420_clk_top0_priv),
+	.priv_auto	= sizeof(struct exynos7420_clk_top0_priv),
 	.ops = &exynos7420_clk_top0_ops,
 };
 
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 76b27ad7fd0..6bc1b8ba9d3 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -226,5 +226,5 @@  U_BOOT_DRIVER(ics8n3qv01) = {
 	.ops		= &ics8n3qv01_ops,
 	.of_match       = ics8n3qv01_ids,
 	.probe		= ics8n3qv01_probe,
-	.priv_auto_alloc_size	= sizeof(struct ics8n3qv01_priv),
+	.priv_auto	= sizeof(struct ics8n3qv01_priv),
 };
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index 02461491078..259ea335959 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -716,7 +716,7 @@  U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_apmixed_compat,
 	.probe = mt7622_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -726,7 +726,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_topckgen_compat,
 	.probe = mt7622_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -736,7 +736,7 @@  U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_infracfg_compat,
 	.probe = mt7622_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -746,7 +746,7 @@  U_BOOT_DRIVER(mtk_clk_pericfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_pericfg_compat,
 	.probe = mt7622_pericfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -757,7 +757,7 @@  U_BOOT_DRIVER(mtk_clk_pciesys) = {
 	.of_match = mt7622_pciesys_compat,
 	.probe = mt7622_pciesys_probe,
 	.bind = mt7622_pciesys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -767,7 +767,7 @@  U_BOOT_DRIVER(mtk_clk_ethsys) = {
 	.of_match = mt7622_ethsys_compat,
 	.probe = mt7622_ethsys_probe,
 	.bind = mt7622_ethsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -776,7 +776,7 @@  U_BOOT_DRIVER(mtk_clk_sgmiisys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_sgmiisys_compat,
 	.probe = mt7622_sgmiisys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -785,6 +785,6 @@  U_BOOT_DRIVER(mtk_clk_ssusbsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7622_ssusbsys_compat,
 	.probe = mt7622_ssusbsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index a15fb45e8e7..0c7411ee814 100644
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -859,7 +859,7 @@  U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_apmixed_compat,
 	.probe = mt7623_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -869,7 +869,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_topckgen_compat,
 	.probe = mt7623_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -879,7 +879,7 @@  U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_infracfg_compat,
 	.probe = mt7623_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -889,7 +889,7 @@  U_BOOT_DRIVER(mtk_clk_pericfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7623_pericfg_compat,
 	.probe = mt7623_pericfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -900,7 +900,7 @@  U_BOOT_DRIVER(mtk_clk_hifsys) = {
 	.of_match = mt7623_hifsys_compat,
 	.probe = mt7623_hifsys_probe,
 	.bind = mt7623_ethsys_hifsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -910,6 +910,6 @@  U_BOOT_DRIVER(mtk_clk_ethsys) = {
 	.of_match = mt7623_ethsys_compat,
 	.probe = mt7623_ethsys_probe,
 	.bind = mt7623_ethsys_hifsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c
index 5b2aa5f200a..31b6fa02251 100644
--- a/drivers/clk/mediatek/clk-mt7629.c
+++ b/drivers/clk/mediatek/clk-mt7629.c
@@ -704,7 +704,7 @@  U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_apmixed_compat,
 	.probe = mt7629_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -714,7 +714,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_topckgen_compat,
 	.probe = mt7629_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -724,7 +724,7 @@  U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_infracfg_compat,
 	.probe = mt7629_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -734,7 +734,7 @@  U_BOOT_DRIVER(mtk_clk_pericfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_pericfg_compat,
 	.probe = mt7629_pericfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -745,7 +745,7 @@  U_BOOT_DRIVER(mtk_clk_ethsys) = {
 	.of_match = mt7629_ethsys_compat,
 	.probe = mt7629_ethsys_probe,
 	.bind = mt7629_ethsys_bind,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -754,7 +754,7 @@  U_BOOT_DRIVER(mtk_clk_sgmiisys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_sgmiisys_compat,
 	.probe = mt7629_sgmiisys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
 
@@ -763,6 +763,6 @@  U_BOOT_DRIVER(mtk_clk_ssusbsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7629_ssusbsys_compat,
 	.probe = mt7629_ssusbsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 };
diff --git a/drivers/clk/mediatek/clk-mt8512.c b/drivers/clk/mediatek/clk-mt8512.c
index ad254d1cce5..193e069cb05 100644
--- a/drivers/clk/mediatek/clk-mt8512.c
+++ b/drivers/clk/mediatek/clk-mt8512.c
@@ -838,7 +838,7 @@  U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_apmixed_compat,
 	.probe = mt8512_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -848,7 +848,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_topckgen_compat,
 	.probe = mt8512_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -858,7 +858,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen_cg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_topckgen_cg_compat,
 	.probe = mt8512_topckgen_cg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -868,7 +868,7 @@  U_BOOT_DRIVER(mtk_clk_infracfg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8512_infracfg_compat,
 	.probe = mt8512_infracfg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/mediatek/clk-mt8516.c b/drivers/clk/mediatek/clk-mt8516.c
index cd1db257836..29f70620e09 100644
--- a/drivers/clk/mediatek/clk-mt8516.c
+++ b/drivers/clk/mediatek/clk-mt8516.c
@@ -777,7 +777,7 @@  U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8516_apmixed_compat,
 	.probe = mt8516_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -787,7 +787,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8516_topckgen_compat,
 	.probe = mt8516_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -797,7 +797,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen_cg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8516_topckgen_cg_compat,
 	.probe = mt8516_topckgen_cg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/mediatek/clk-mt8518.c b/drivers/clk/mediatek/clk-mt8518.c
index 985a0c1de5e..23865148372 100644
--- a/drivers/clk/mediatek/clk-mt8518.c
+++ b/drivers/clk/mediatek/clk-mt8518.c
@@ -1533,7 +1533,7 @@  U_BOOT_DRIVER(mtk_clk_apmixedsys) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8518_apmixed_compat,
 	.probe = mt8518_apmixedsys_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_apmixedsys_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -1543,7 +1543,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8518_topckgen_compat,
 	.probe = mt8518_topckgen_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_clk_priv),
+	.priv_auto	= sizeof(struct mtk_clk_priv),
 	.ops = &mtk_clk_topckgen_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
@@ -1553,7 +1553,7 @@  U_BOOT_DRIVER(mtk_clk_topckgen_cg) = {
 	.id = UCLASS_CLK,
 	.of_match = mt8518_topckgen_cg_compat,
 	.probe = mt8518_topckgen_cg_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+	.priv_auto	= sizeof(struct mtk_cg_priv),
 	.ops = &mtk_clk_gate_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 6ef8b418d78..82068578ffb 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -320,7 +320,7 @@  U_BOOT_DRIVER(meson_clk_axg) = {
 	.name		= "meson_clk_axg",
 	.id		= UCLASS_CLK,
 	.of_match	= meson_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct meson_clk),
+	.priv_auto	= sizeof(struct meson_clk),
 	.ops		= &meson_clk_ops,
 	.probe		= meson_clk_probe,
 };
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index bf2f357435a..01b22abc34d 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -1014,7 +1014,7 @@  U_BOOT_DRIVER(meson_clk_g12a) = {
 	.name		= "meson_clk_g12a",
 	.id		= UCLASS_CLK,
 	.of_match	= meson_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct meson_clk),
+	.priv_auto	= sizeof(struct meson_clk),
 	.ops		= &meson_clk_ops,
 	.probe		= meson_clk_probe,
 };
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index b9353c053eb..2a20541dcb4 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -919,7 +919,7 @@  U_BOOT_DRIVER(meson_clk) = {
 	.name		= "meson_clk",
 	.id		= UCLASS_CLK,
 	.of_match	= meson_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct meson_clk),
+	.priv_auto	= sizeof(struct meson_clk),
 	.ops		= &meson_clk_ops,
 	.probe		= meson_clk_probe,
 };
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 8d96ec767ac..c5ced1f132c 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -389,7 +389,7 @@  U_BOOT_DRIVER(mpc83xx_clk) = {
 	.of_match = mpc83xx_clk_match,
 	.ops = &mpc83xx_clk_ops,
 	.probe = mpc83xx_clk_probe,
-	.priv_auto_alloc_size	= sizeof(struct mpc83xx_clk_priv),
+	.priv_auto	= sizeof(struct mpc83xx_clk_priv),
 	.bind = mpc83xx_clk_bind,
 };
 
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index 35780de8c49..4d3ac847d1d 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -153,6 +153,6 @@  U_BOOT_DRIVER(mt7628_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = mt7628_clk_ids,
 	.probe = mt7628_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct mt7628_clk_priv),
+	.priv_auto	= sizeof(struct mt7628_clk_priv),
 	.ops = &mt7628_clk_ops,
 };
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 223da22c1b6..0132fcb7e61 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -624,6 +624,6 @@  U_BOOT_DRIVER(armada_37xx_periph_clk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= armada_37xx_periph_clk_ids,
 	.ops		= &armada_37xx_periph_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct a37xx_periphclk),
+	.priv_auto	= sizeof(struct a37xx_periphclk),
 	.probe		= armada_37xx_periph_clk_probe,
 };
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 233926e9b6a..b1c0852e89b 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -150,6 +150,6 @@  U_BOOT_DRIVER(armada_37xx_tbg_clk) = {
 	.id		= UCLASS_CLK,
 	.of_match	= armada_37xx_tbg_clk_ids,
 	.ops		= &armada_37xx_tbg_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct a37xx_tbgclk),
+	.priv_auto	= sizeof(struct a37xx_tbgclk),
 	.probe		= armada_37xx_tbg_clk_probe,
 };
diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c
index 1999c87a336..96ab7fed1f3 100644
--- a/drivers/clk/owl/clk_owl.c
+++ b/drivers/clk/owl/clk_owl.c
@@ -161,6 +161,6 @@  U_BOOT_DRIVER(clk_owl) = {
 	.id		= UCLASS_CLK,
 	.of_match	= owl_clk_ids,
 	.ops		= &owl_clk_ops,
-	.priv_auto_alloc_size = sizeof(struct owl_clk_priv),
+	.priv_auto	= sizeof(struct owl_clk_priv),
 	.probe		= owl_clk_probe,
 };
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
index 6997054b304..1c54eca6c0f 100644
--- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
@@ -336,7 +336,7 @@  U_BOOT_DRIVER(clk_r8a774a1) = {
 	.name		= "clk_r8a774a1",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774a1_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a774b1-cpg-mssr.c b/drivers/clk/renesas/r8a774b1-cpg-mssr.c
index 7b6947b5b90..03851d0b5a3 100644
--- a/drivers/clk/renesas/r8a774b1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774b1-cpg-mssr.c
@@ -329,7 +329,7 @@  U_BOOT_DRIVER(clk_r8a774b1) = {
 	.name		= "clk_r8a774b1",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774b1_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a774c0-cpg-mssr.c b/drivers/clk/renesas/r8a774c0-cpg-mssr.c
index c9f0f7221d7..37a7123f73d 100644
--- a/drivers/clk/renesas/r8a774c0-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774c0-cpg-mssr.c
@@ -301,7 +301,7 @@  U_BOOT_DRIVER(clk_r8a774c0) = {
 	.name		= "clk_r8a774c0",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774c0_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a774e1-cpg-mssr.c b/drivers/clk/renesas/r8a774e1-cpg-mssr.c
index 6cce007aa13..c969ec68883 100644
--- a/drivers/clk/renesas/r8a774e1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774e1-cpg-mssr.c
@@ -351,7 +351,7 @@  U_BOOT_DRIVER(clk_r8a774e1) = {
 	.name		= "clk_r8a774e1",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a774e1_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c
index 7451f53ba39..09e7dbd3a36 100644
--- a/drivers/clk/renesas/r8a7790-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c
@@ -283,7 +283,7 @@  U_BOOT_DRIVER(clk_r8a7790) = {
 	.name		= "clk_r8a7790",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7790_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c
index 25fd4896094..675ac83a61d 100644
--- a/drivers/clk/renesas/r8a7791-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c
@@ -289,7 +289,7 @@  U_BOOT_DRIVER(clk_r8a7791) = {
 	.name		= "clk_r8a7791",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7791_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index d47ab99e882..d2225a3ff5f 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -235,7 +235,7 @@  U_BOOT_DRIVER(clk_r8a7792) = {
 	.name		= "clk_r8a7792",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7792_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c
index 7093e0d42cb..1fcac9b59d8 100644
--- a/drivers/clk/renesas/r8a7794-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c
@@ -264,7 +264,7 @@  U_BOOT_DRIVER(clk_r8a7794) = {
 	.name		= "clk_r8a7794",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7794_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen2_clk_priv),
+	.priv_auto	= sizeof(struct gen2_clk_priv),
 	.ops		= &gen2_clk_ops,
 	.probe		= gen2_clk_probe,
 	.remove		= gen2_clk_remove,
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index dcd96ad0177..101f6583fac 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -373,7 +373,7 @@  U_BOOT_DRIVER(clk_r8a7795) = {
 	.name		= "clk_r8a7795",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7795_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 89dc141239d..3c17bcbb187 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -351,7 +351,7 @@  U_BOOT_DRIVER(clk_r8a7796) = {
 	.name		= "clk_r8a7796",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a7796_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
index 6ed88295c98..5f37f6285f3 100644
--- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
@@ -349,7 +349,7 @@  U_BOOT_DRIVER(clk_r8a77965) = {
 	.name		= "clk_r8a77965",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77965_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index df071201718..bafe4bbb094 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -226,7 +226,7 @@  U_BOOT_DRIVER(clk_r8a77970) = {
 	.name		= "clk_r8a77970",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77970_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c
index c8d7a9469ba..a202005121b 100644
--- a/drivers/clk/renesas/r8a77980-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c
@@ -249,7 +249,7 @@  U_BOOT_DRIVER(clk_r8a77980) = {
 	.name		= "clk_r8a77980",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77980_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
index 357e7b534da..5cc9270869e 100644
--- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
@@ -308,7 +308,7 @@  U_BOOT_DRIVER(clk_r8a77990) = {
 	.name		= "clk_r8a77990",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77990_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c
index d62aeba635b..eef154bc826 100644
--- a/drivers/clk/renesas/r8a77995-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c
@@ -247,7 +247,7 @@  U_BOOT_DRIVER(clk_r8a77995) = {
 	.name		= "clk_r8a77995",
 	.id		= UCLASS_CLK,
 	.of_match	= r8a77995_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct gen3_clk_priv),
+	.priv_auto	= sizeof(struct gen3_clk_priv),
 	.ops		= &gen3_clk_ops,
 	.probe		= gen3_clk_probe,
 	.remove		= gen3_clk_remove,
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 71916dbf3b1..f12b010d5af 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -1480,7 +1480,7 @@  U_BOOT_DRIVER(rockchip_px30_cru) = {
 	.name		= "rockchip_px30_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= px30_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct px30_clk_priv),
+	.priv_auto	= sizeof(struct px30_clk_priv),
 	.ofdata_to_platdata = px30_clk_ofdata_to_platdata,
 	.ops		= &px30_clk_ops,
 	.bind		= px30_clk_bind,
@@ -1627,7 +1627,7 @@  U_BOOT_DRIVER(rockchip_px30_pmucru) = {
 	.name		= "rockchip_px30_pmucru",
 	.id		= UCLASS_CLK,
 	.of_match	= px30_pmuclk_ids,
-	.priv_auto_alloc_size = sizeof(struct px30_pmuclk_priv),
+	.priv_auto	= sizeof(struct px30_pmuclk_priv),
 	.ofdata_to_platdata = px30_pmuclk_ofdata_to_platdata,
 	.ops		= &px30_pmuclk_ops,
 	.probe		= px30_pmuclk_probe,
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 274572f70c1..8d11e242d05 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -375,7 +375,7 @@  U_BOOT_DRIVER(rockchip_rk3036_cru) = {
 	.name		= "clk_rk3036",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3036_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3036_clk_priv),
+	.priv_auto	= sizeof(struct rk3036_clk_priv),
 	.ofdata_to_platdata = rk3036_clk_ofdata_to_platdata,
 	.ops		= &rk3036_clk_ops,
 	.bind		= rk3036_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 61f823e254e..ac44ab442c7 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -597,7 +597,7 @@  U_BOOT_DRIVER(rockchip_rk3128_cru) = {
 	.name		= "clk_rk3128",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3128_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3128_clk_priv),
+	.priv_auto	= sizeof(struct rk3128_clk_priv),
 	.ofdata_to_platdata = rk3128_clk_ofdata_to_platdata,
 	.ops		= &rk3128_clk_ops,
 	.bind		= rk3128_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index aacc8cf2d14..5940cb33d47 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -616,8 +616,8 @@  U_BOOT_DRIVER(rockchip_rk3188_cru) = {
 	.name			= "rockchip_rk3188_cru",
 	.id			= UCLASS_CLK,
 	.of_match		= rk3188_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct rk3188_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct rk3188_clk_plat),
+	.priv_auto	= sizeof(struct rk3188_clk_priv),
+	.platdata_auto	= sizeof(struct rk3188_clk_plat),
 	.ops			= &rk3188_clk_ops,
 	.bind			= rk3188_clk_bind,
 	.ofdata_to_platdata	= rk3188_clk_ofdata_to_platdata,
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 054b2fd349b..92e7ff384e1 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -532,7 +532,7 @@  U_BOOT_DRIVER(rockchip_rk322x_cru) = {
 	.name		= "clk_rk322x",
 	.id		= UCLASS_CLK,
 	.of_match	= rk322x_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk322x_clk_priv),
+	.priv_auto	= sizeof(struct rk322x_clk_priv),
 	.ofdata_to_platdata = rk322x_clk_ofdata_to_platdata,
 	.ops		= &rk322x_clk_ops,
 	.bind		= rk322x_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a1dd642eefe..7c91e00c685 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -1040,8 +1040,8 @@  U_BOOT_DRIVER(rockchip_rk3288_cru) = {
 	.name		= "rockchip_rk3288_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3288_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3288_clk_priv),
-	.platdata_auto_alloc_size = sizeof(struct rk3288_clk_plat),
+	.priv_auto	= sizeof(struct rk3288_clk_priv),
+	.platdata_auto	= sizeof(struct rk3288_clk_plat),
 	.ops		= &rk3288_clk_ops,
 	.bind		= rk3288_clk_bind,
 	.ofdata_to_platdata	= rk3288_clk_ofdata_to_platdata,
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index d3633b69795..c36512b6794 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -1067,7 +1067,7 @@  U_BOOT_DRIVER(rockchip_rk3308_cru) = {
 	.name		= "rockchip_rk3308_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3308_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3308_clk_priv),
+	.priv_auto	= sizeof(struct rk3308_clk_priv),
 	.ofdata_to_platdata = rk3308_clk_ofdata_to_platdata,
 	.ops		= &rk3308_clk_ops,
 	.bind		= rk3308_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index bf4f1069ea6..e28e0996c68 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -845,7 +845,7 @@  U_BOOT_DRIVER(rockchip_rk3328_cru) = {
 	.name		= "rockchip_rk3328_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3328_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3328_clk_priv),
+	.priv_auto	= sizeof(struct rk3328_clk_priv),
 	.ofdata_to_platdata = rk3328_clk_ofdata_to_platdata,
 	.ops		= &rk3328_clk_ops,
 	.bind		= rk3328_clk_bind,
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index d1804c6e168..84b55ac6180 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -643,9 +643,9 @@  U_BOOT_DRIVER(rockchip_rk3368_cru) = {
 	.name		= "rockchip_rk3368_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3368_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3368_clk_priv),
+	.priv_auto	= sizeof(struct rk3368_clk_priv),
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rk3368_clk_plat),
+	.platdata_auto	= sizeof(struct rk3368_clk_plat),
 #endif
 	.ofdata_to_platdata = rk3368_clk_ofdata_to_platdata,
 	.ops		= &rk3368_clk_ops,
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 3fd863e7bd0..2e2613fd0dc 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -1447,13 +1447,13 @@  U_BOOT_DRIVER(clk_rk3399) = {
 	.name		= "rockchip_rk3399_cru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3399_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3399_clk_priv),
+	.priv_auto	= sizeof(struct rk3399_clk_priv),
 	.ofdata_to_platdata = rk3399_clk_ofdata_to_platdata,
 	.ops		= &rk3399_clk_ops,
 	.bind		= rk3399_clk_bind,
 	.probe		= rk3399_clk_probe,
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rk3399_clk_plat),
+	.platdata_auto	= sizeof(struct rk3399_clk_plat),
 #endif
 };
 
@@ -1642,12 +1642,12 @@  U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = {
 	.name		= "rockchip_rk3399_pmucru",
 	.id		= UCLASS_CLK,
 	.of_match	= rk3399_pmuclk_ids,
-	.priv_auto_alloc_size = sizeof(struct rk3399_pmuclk_priv),
+	.priv_auto	= sizeof(struct rk3399_pmuclk_priv),
 	.ofdata_to_platdata = rk3399_pmuclk_ofdata_to_platdata,
 	.ops		= &rk3399_pmuclk_ops,
 	.probe		= rk3399_pmuclk_probe,
 	.bind		= rk3399_pmuclk_bind,
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rk3399_pmuclk_plat),
+	.platdata_auto	= sizeof(struct rk3399_pmuclk_plat),
 #endif
 };
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index aa1d98ca2a2..efc07a05b1d 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -719,7 +719,7 @@  U_BOOT_DRIVER(clk_rv1108) = {
 	.name		= "clk_rv1108",
 	.id		= UCLASS_CLK,
 	.of_match	= rv1108_clk_ids,
-	.priv_auto_alloc_size = sizeof(struct rv1108_clk_priv),
+	.priv_auto	= sizeof(struct rv1108_clk_priv),
 	.ops		= &rv1108_clk_ops,
 	.bind		= rv1108_clk_bind,
 	.ofdata_to_platdata	= rv1108_clk_ofdata_to_platdata,
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 1b4d81d4f06..9a08c148a0d 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -807,6 +807,6 @@  U_BOOT_DRIVER(sifive_fu540_prci) = {
 	.of_match = sifive_fu540_prci_ids,
 	.probe = sifive_fu540_prci_probe,
 	.ops = &sifive_fu540_prci_ops,
-	.priv_auto_alloc_size = sizeof(struct __prci_data),
+	.priv_auto	= sizeof(struct __prci_data),
 	.bind = sifive_fu540_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index 67507c5ab1d..1b5de86e204 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -79,7 +79,7 @@  U_BOOT_DRIVER(clk_sun4i_a10) = {
 	.name		= "sun4i_a10_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a10_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a10_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index d11a4b5f038..184f61ab234 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -66,7 +66,7 @@  U_BOOT_DRIVER(clk_sun5i_a10s) = {
 	.name		= "sun5i_a10s_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a10s_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a10s_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index 4d562bfe427..5750514a74f 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -82,7 +82,7 @@  U_BOOT_DRIVER(clk_sun8i_a23) = {
 	.name		= "sun8i_a23_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a23_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a23_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index 4a9454eebe7..9226112f4af 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -99,7 +99,7 @@  U_BOOT_DRIVER(clk_sun6i_a31) = {
 	.name		= "sun6i_a31_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a31_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a31_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index d96cb1aac1c..0553ffa4399 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -87,7 +87,7 @@  U_BOOT_DRIVER(clk_sun50i_a64) = {
 	.name		= "sun50i_a64_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a64_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a64_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index 80d7407037e..68973d528ed 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -94,7 +94,7 @@  U_BOOT_DRIVER(clk_sun9i_a80) = {
 	.name		= "sun9i_a80_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a80_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a80_clk_bind,
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index d6f23ddc778..880c7d75997 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -84,7 +84,7 @@  U_BOOT_DRIVER(clk_sun8i_a83t) = {
 	.name		= "sun8i_a83t_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= a83t_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= a83t_clk_bind,
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index 7e844f4ff16..f81633b92d5 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -102,7 +102,7 @@  U_BOOT_DRIVER(clk_sun8i_h3) = {
 	.name		= "sun8i_h3_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= h3_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= h3_clk_bind,
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index a1cb8952d39..ac8656fe895 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -95,7 +95,7 @@  U_BOOT_DRIVER(clk_sun50i_h6) = {
 	.name		= "sun50i_h6_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= h6_ccu_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= h6_clk_bind,
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index ac360b2bebd..ee1e86d22eb 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -107,7 +107,7 @@  U_BOOT_DRIVER(clk_sun8i_r40) = {
 	.name		= "sun8i_r40_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= r40_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= r40_clk_bind,
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index f3fc06ab31e..29622199fdc 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -65,7 +65,7 @@  U_BOOT_DRIVER(clk_sun8i_v3s) = {
 	.name		= "sun8i_v3s_ccu",
 	.id		= UCLASS_CLK,
 	.of_match	= v3s_clk_ids,
-	.priv_auto_alloc_size	= sizeof(struct ccu_priv),
+	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
 	.bind		= v3s_clk_bind,
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 4e25db354e0..c31e59641d9 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -342,6 +342,6 @@  U_BOOT_DRIVER(uniphier_clk) = {
 	.id = UCLASS_CLK,
 	.of_match = uniphier_clk_match,
 	.probe = uniphier_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_clk_priv),
+	.priv_auto	= sizeof(struct uniphier_clk_priv),
 	.ops = &uniphier_clk_ops,
 };
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 79e888e1eb7..0b71744d939 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -124,20 +124,20 @@  void device_free(struct udevice *dev)
 {
 	int size;
 
-	if (dev->driver->priv_auto_alloc_size) {
+	if (dev->driver->priv_auto) {
 		free(dev->priv);
 		dev->priv = NULL;
 	}
-	size = dev->uclass->uc_drv->per_device_auto_alloc_size;
+	size = dev->uclass->uc_drv->per_device_auto;
 	if (size) {
 		free(dev->uclass_priv);
 		dev->uclass_priv = NULL;
 	}
 	if (dev->parent) {
-		size = dev->parent->driver->per_child_auto_alloc_size;
+		size = dev->parent->driver->per_child_auto;
 		if (!size) {
 			size = dev->parent->uclass->uc_drv->
-					per_child_auto_alloc_size;
+					per_child_auto;
 		}
 		if (size) {
 			free(dev->parent_priv);
diff --git a/drivers/core/device.c b/drivers/core/device.c
index bcf437ac231..f74eaa55fa7 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -94,21 +94,19 @@  static int device_bind_common(struct udevice *parent, const struct driver *drv,
 			dev->sqq = uclass_find_next_free_seq(uc);
 	}
 
-	if (drv->platdata_auto_alloc_size) {
+	if (drv->platdata_auto) {
 		bool alloc = !platdata;
 
 		if (CONFIG_IS_ENABLED(OF_PLATDATA)) {
 			if (of_platdata_size) {
 				dev->flags |= DM_FLAG_OF_PLATDATA;
-				if (of_platdata_size <
-						drv->platdata_auto_alloc_size)
+				if (of_platdata_size < drv->platdata_auto)
 					alloc = true;
 			}
 		}
 		if (alloc) {
 			dev->flags |= DM_FLAG_ALLOC_PDATA;
-			dev->platdata = calloc(1,
-					       drv->platdata_auto_alloc_size);
+			dev->platdata = calloc(1, drv->platdata_auto);
 			if (!dev->platdata) {
 				ret = -ENOMEM;
 				goto fail_alloc1;
@@ -120,7 +118,7 @@  static int device_bind_common(struct udevice *parent, const struct driver *drv,
 		}
 	}
 
-	size = uc->uc_drv->per_device_platdata_auto_alloc_size;
+	size = uc->uc_drv->per_device_platdata_auto;
 	if (size) {
 		dev->flags |= DM_FLAG_ALLOC_UCLASS_PDATA;
 		dev->uclass_platdata = calloc(1, size);
@@ -131,10 +129,9 @@  static int device_bind_common(struct udevice *parent, const struct driver *drv,
 	}
 
 	if (parent) {
-		size = parent->driver->per_child_platdata_auto_alloc_size;
+		size = parent->driver->per_child_platdata_auto;
 		if (!size) {
-			size = parent->uclass->uc_drv->
-					per_child_platdata_auto_alloc_size;
+			size = parent->uclass->uc_drv->per_child_platdata_auto;
 		}
 		if (size) {
 			dev->flags |= DM_FLAG_ALLOC_PARENT_PDATA;
@@ -361,15 +358,15 @@  int device_ofdata_to_platdata(struct udevice *dev)
 	assert(drv);
 
 	/* Allocate private data if requested and not reentered */
-	if (drv->priv_auto_alloc_size && !dev->priv) {
-		dev->priv = alloc_priv(drv->priv_auto_alloc_size, drv->flags);
+	if (drv->priv_auto && !dev->priv) {
+		dev->priv = alloc_priv(drv->priv_auto, drv->flags);
 		if (!dev->priv) {
 			ret = -ENOMEM;
 			goto fail;
 		}
 	}
 	/* Allocate private data if requested and not reentered */
-	size = dev->uclass->uc_drv->per_device_auto_alloc_size;
+	size = dev->uclass->uc_drv->per_device_auto;
 	if (size && !dev->uclass_priv) {
 		dev->uclass_priv = alloc_priv(size,
 					      dev->uclass->uc_drv->flags);
@@ -381,10 +378,9 @@  int device_ofdata_to_platdata(struct udevice *dev)
 
 	/* Allocate parent data for this child */
 	if (dev->parent) {
-		size = dev->parent->driver->per_child_auto_alloc_size;
+		size = dev->parent->driver->per_child_auto;
 		if (!size) {
-			size = dev->parent->uclass->uc_drv->
-					per_child_auto_alloc_size;
+			size = dev->parent->uclass->uc_drv->per_child_auto;
 		}
 		if (size && !dev->parent_priv) {
 			dev->parent_priv = alloc_priv(size, drv->flags);
diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c
index 7cc1d46009f..c244b393459 100644
--- a/drivers/core/simple-bus.c
+++ b/drivers/core/simple-bus.c
@@ -47,7 +47,7 @@  UCLASS_DRIVER(simple_bus) = {
 	.id		= UCLASS_SIMPLE_BUS,
 	.name		= "simple_bus",
 	.post_bind	= simple_bus_post_bind,
-	.per_device_platdata_auto_alloc_size = sizeof(struct simple_bus_plat),
+	.per_device_platdata_auto	= sizeof(struct simple_bus_plat),
 };
 
 static const struct udevice_id generic_simple_bus_ids[] = {
diff --git a/drivers/core/simple-pm-bus.c b/drivers/core/simple-pm-bus.c
index 51dc9b206fd..7a18953cba1 100644
--- a/drivers/core/simple-pm-bus.c
+++ b/drivers/core/simple-pm-bus.c
@@ -51,6 +51,6 @@  U_BOOT_DRIVER(simple_pm_bus_drv) = {
 	.of_match = simple_pm_bus_ids,
 	.probe = simple_pm_bus_probe,
 	.remove = simple_pm_bus_remove,
-	.priv_auto_alloc_size = sizeof(struct clk_bulk),
+	.priv_auto	= sizeof(struct clk_bulk),
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 567d0a4b50a..823d0731640 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -174,7 +174,7 @@  void *syscon_get_first_range(ulong driver_data)
 UCLASS_DRIVER(syscon) = {
 	.id		= UCLASS_SYSCON,
 	.name		= "syscon",
-	.per_device_auto_alloc_size = sizeof(struct syscon_uc_info),
+	.per_device_auto	= sizeof(struct syscon_uc_info),
 	.pre_probe = syscon_pre_probe,
 };
 
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 8d5e92da288..d3e906640bc 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -71,8 +71,8 @@  static int uclass_add(enum uclass_id id, struct uclass **ucp)
 	uc = calloc(1, sizeof(*uc));
 	if (!uc)
 		return -ENOMEM;
-	if (uc_drv->priv_auto_alloc_size) {
-		uc->priv = calloc(1, uc_drv->priv_auto_alloc_size);
+	if (uc_drv->priv_auto) {
+		uc->priv = calloc(1, uc_drv->priv_auto);
 		if (!uc->priv) {
 			ret = -ENOMEM;
 			goto fail_mem;
@@ -93,7 +93,7 @@  static int uclass_add(enum uclass_id id, struct uclass **ucp)
 
 	return 0;
 fail:
-	if (uc_drv->priv_auto_alloc_size) {
+	if (uc_drv->priv_auto) {
 		free(uc->priv);
 		uc->priv = NULL;
 	}
@@ -131,7 +131,7 @@  int uclass_destroy(struct uclass *uc)
 	if (uc_drv->destroy)
 		uc_drv->destroy(uc);
 	list_del(&uc->sibling_node);
-	if (uc_drv->priv_auto_alloc_size)
+	if (uc_drv->priv_auto)
 		free(uc->priv);
 	free(uc);
 
diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c
index 058ae3a8119..07dba7d5601 100644
--- a/drivers/cpu/at91_cpu.c
+++ b/drivers/cpu/at91_cpu.c
@@ -118,6 +118,6 @@  U_BOOT_DRIVER(cpu_at91_drv) = {
 	.of_match	= at91_cpu_ids,
 	.ops		= &at91_cpu_ops,
 	.probe		= at91_cpu_probe,
-	.platdata_auto_alloc_size = sizeof(struct at91_cpu_platdata),
+	.platdata_auto	= sizeof(struct at91_cpu_platdata),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 421cc7a9a4c..0946b95f589 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -489,7 +489,7 @@  U_BOOT_DRIVER(bmips_cpu_drv) = {
 	.of_match = bmips_cpu_ids,
 	.bind = bmips_cpu_bind,
 	.probe = bmips_cpu_probe,
-	.priv_auto_alloc_size = sizeof(struct bmips_cpu_priv),
+	.priv_auto	= sizeof(struct bmips_cpu_priv),
 	.ops = &bmips_cpu_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c
index 37e3cf2d8ff..6f6f90c5581 100644
--- a/drivers/cpu/cpu-uclass.c
+++ b/drivers/cpu/cpu-uclass.c
@@ -115,7 +115,7 @@  int cpu_get_vendor(const struct udevice *dev, char *buf, int size)
 U_BOOT_DRIVER(cpu_bus) = {
 	.name	= "cpu_bus",
 	.id	= UCLASS_SIMPLE_BUS,
-	.per_child_platdata_auto_alloc_size = sizeof(struct cpu_platdata),
+	.per_child_platdata_auto	= sizeof(struct cpu_platdata),
 };
 
 static int uclass_cpu_init(struct uclass *uc)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 502c8ebb433..641322554cc 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -230,6 +230,6 @@  U_BOOT_DRIVER(cpu_imx8_drv) = {
 	.of_match	= cpu_imx8_ids,
 	.ops		= &cpu_imx8_ops,
 	.probe		= imx8_cpu_probe,
-	.platdata_auto_alloc_size = sizeof(struct cpu_imx_platdata),
+	.platdata_auto	= sizeof(struct cpu_imx_platdata),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 5f1592f9ad4..e451c11116a 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -348,7 +348,7 @@  U_BOOT_DRIVER(mpc83xx_cpu) = {
 	.id = UCLASS_CPU,
 	.of_match = mpc83xx_cpu_ids,
 	.probe = mpc83xx_cpu_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_cpu_priv),
+	.priv_auto	= sizeof(struct mpc83xx_cpu_priv),
 	.ops = &mpc83xx_cpu_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index 3c0c2b067f3..06364948052 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -83,6 +83,6 @@  U_BOOT_DRIVER(caam_rng) = {
 	.id = UCLASS_RNG,
 	.ops = &caam_rng_ops,
 	.probe = caam_rng_probe,
-	.priv_auto_alloc_size = sizeof(struct caam_rng_priv),
+	.priv_auto	= sizeof(struct caam_rng_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 1360bd0a3b8..4c118f0846a 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -647,9 +647,9 @@  U_BOOT_DRIVER(altera_gen5_sdram) = {
 	.of_match = altera_gen5_sdram_ids,
 	.ops = &altera_gen5_sdram_ops,
 	.ofdata_to_platdata = altera_gen5_sdram_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_gen5_sdram_platdata),
+	.platdata_auto	= sizeof(struct altera_gen5_sdram_platdata),
 	.probe = altera_gen5_sdram_probe,
-	.priv_auto_alloc_size = sizeof(struct altera_gen5_sdram_priv),
+	.priv_auto	= sizeof(struct altera_gen5_sdram_priv),
 };
 
 #endif /* CONFIG_SPL_BUILD */
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 8cb75fe02a2..2c44b78bffe 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -304,7 +304,7 @@  U_BOOT_DRIVER(altera_sdram) = {
 	.of_match = altera_sdram_ids,
 	.ops = &altera_sdram_ops,
 	.ofdata_to_platdata = altera_sdram_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_sdram_platdata),
+	.platdata_auto	= sizeof(struct altera_sdram_platdata),
 	.probe = altera_sdram_probe,
-	.priv_auto_alloc_size = sizeof(struct altera_sdram_priv),
+	.priv_auto	= sizeof(struct altera_sdram_priv),
 };
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 8686c998457..0f5cda23dd3 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -193,6 +193,6 @@  U_BOOT_DRIVER(demo_shape_drv) = {
 	.ops	= &shape_ops,
 	.probe = dm_shape_probe,
 	.remove = dm_shape_remove,
-	.priv_auto_alloc_size = sizeof(struct shape_data),
-	.platdata_auto_alloc_size = sizeof(struct dm_demo_pdata),
+	.priv_auto	= sizeof(struct shape_data),
+	.platdata_auto	= sizeof(struct dm_demo_pdata),
 };
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 68972c780f4..bf714660ce6 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -43,5 +43,5 @@  U_BOOT_DRIVER(demo_simple_drv) = {
 	.id	= UCLASS_DEMO,
 	.ofdata_to_platdata = demo_shape_ofdata_to_platdata,
 	.ops	= &simple_ops,
-	.platdata_auto_alloc_size = sizeof(struct dm_demo_pdata),
+	.platdata_auto	= sizeof(struct dm_demo_pdata),
 };
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index 91172d483c7..98577601b58 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -649,6 +649,6 @@  U_BOOT_DRIVER(bcm6348_iudma) = {
 	.id = UCLASS_DMA,
 	.of_match = bcm6348_iudma_ids,
 	.ops = &bcm6348_iudma_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6348_iudma_priv),
+	.priv_auto	= sizeof(struct bcm6348_iudma_priv),
 	.probe = bcm6348_iudma_probe,
 };
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 50403148d6d..a93b0b7ba08 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -254,5 +254,5 @@  UCLASS_DRIVER(dma) = {
 	.id		= UCLASS_DMA,
 	.name		= "dma",
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
-	.per_device_auto_alloc_size = sizeof(struct dma_dev_priv),
+	.per_device_auto	= sizeof(struct dma_dev_priv),
 };
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 838596b24b6..aebf3eef966 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -280,5 +280,5 @@  U_BOOT_DRIVER(sandbox_dma) = {
 	.of_match = sandbox_dma_ids,
 	.ops	= &sandbox_dma_ops,
 	.probe = sandbox_dma_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_dma_dev),
+	.priv_auto	= sizeof(struct sandbox_dma_dev),
 };
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index 13ab9670890..4272f4cab80 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -576,6 +576,6 @@  U_BOOT_DRIVER(ti_edma3) = {
 	.ops	= &ti_edma3_ops,
 	.ofdata_to_platdata = ti_edma3_ofdata_to_platdata,
 	.probe	= ti_edma3_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_edma3_priv),
+	.priv_auto	= sizeof(struct ti_edma3_priv),
 };
 #endif /* CONFIG_DMA */
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 94216045ccc..f3ec827897f 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -1933,5 +1933,5 @@  U_BOOT_DRIVER(ti_edma3) = {
 	.of_match = udma_ids,
 	.ops	= &udma_ops,
 	.probe	= udma_probe,
-	.priv_auto_alloc_size = sizeof(struct udma_dev),
+	.priv_auto	= sizeof(struct udma_dev),
 };
diff --git a/drivers/firmware/scmi/mailbox_agent.c b/drivers/firmware/scmi/mailbox_agent.c
index a85cff1097e..3f4b04a4ae4 100644
--- a/drivers/firmware/scmi/mailbox_agent.c
+++ b/drivers/firmware/scmi/mailbox_agent.c
@@ -97,7 +97,7 @@  U_BOOT_DRIVER(scmi_mbox) = {
 	.name		= "scmi-over-mailbox",
 	.id		= UCLASS_SCMI_AGENT,
 	.of_match	= scmi_mbox_ids,
-	.priv_auto_alloc_size = sizeof(struct scmi_mbox_channel),
+	.priv_auto	= sizeof(struct scmi_mbox_channel),
 	.probe		= scmi_mbox_probe,
 	.ops		= &scmi_mbox_ops,
 };
diff --git a/drivers/firmware/scmi/sandbox-scmi_agent.c b/drivers/firmware/scmi/sandbox-scmi_agent.c
index 5b6a4232af4..35de68c75d3 100644
--- a/drivers/firmware/scmi/sandbox-scmi_agent.c
+++ b/drivers/firmware/scmi/sandbox-scmi_agent.c
@@ -403,7 +403,7 @@  U_BOOT_DRIVER(sandbox_scmi_agent) = {
 	.name = "sandbox-scmi_agent",
 	.id = UCLASS_SCMI_AGENT,
 	.of_match = sandbox_scmi_test_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_scmi_agent),
+	.priv_auto	= sizeof(struct sandbox_scmi_agent),
 	.probe = sandbox_scmi_test_probe,
 	.remove = sandbox_scmi_test_remove,
 	.ops = &sandbox_scmi_test_ops,
diff --git a/drivers/firmware/scmi/sandbox-scmi_devices.c b/drivers/firmware/scmi/sandbox-scmi_devices.c
index c69967bf693..414da6f4df1 100644
--- a/drivers/firmware/scmi/sandbox-scmi_devices.c
+++ b/drivers/firmware/scmi/sandbox-scmi_devices.c
@@ -107,7 +107,7 @@  U_BOOT_DRIVER(sandbox_scmi_devices) = {
 	.name = "sandbox-scmi_devices",
 	.id = UCLASS_MISC,
 	.of_match = sandbox_scmi_devices_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_scmi_device_priv),
+	.priv_auto	= sizeof(struct sandbox_scmi_device_priv),
 	.remove = sandbox_scmi_devices_remove,
 	.probe = sandbox_scmi_devices_probe,
 };
diff --git a/drivers/firmware/scmi/smccc_agent.c b/drivers/firmware/scmi/smccc_agent.c
index 85dbf9195e0..64d0929f69c 100644
--- a/drivers/firmware/scmi/smccc_agent.c
+++ b/drivers/firmware/scmi/smccc_agent.c
@@ -83,7 +83,7 @@  U_BOOT_DRIVER(scmi_smccc) = {
 	.name		= "scmi-over-smccc",
 	.id		= UCLASS_SCMI_AGENT,
 	.of_match	= scmi_smccc_ids,
-	.priv_auto_alloc_size = sizeof(struct scmi_smccc_channel),
+	.priv_auto	= sizeof(struct scmi_smccc_channel),
 	.probe		= scmi_smccc_probe,
 	.ops		= &scmi_smccc_ops,
 };
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index a2beb0079d8..0cdfb0e91a9 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -3166,5 +3166,5 @@  U_BOOT_DRIVER(ti_sci) = {
 	.id = UCLASS_FIRMWARE,
 	.of_match = ti_sci_ids,
 	.probe = ti_sci_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_info),
+	.priv_auto	= sizeof(struct ti_sci_info),
 };
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 64717a6780e..0c06301a81c 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -187,6 +187,6 @@  U_BOOT_DRIVER(74x164) = {
 	.id		= UCLASS_GPIO,
 	.ops		= &gen_74x164_ops,
 	.probe		= gen_74x164_probe,
-	.priv_auto_alloc_size = sizeof(struct gen_74x164_priv),
+	.priv_auto	= sizeof(struct gen_74x164_priv),
 	.of_match	= gen_74x164_ids,
 };
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index 75800d9f31c..cf0785aeb6a 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -117,6 +117,6 @@  U_BOOT_DRIVER(altera_pio) = {
 	.of_match	= altera_pio_ids,
 	.ops		= &altera_pio_ops,
 	.ofdata_to_platdata = altera_pio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_pio_platdata),
+	.platdata_auto	= sizeof(struct altera_pio_platdata),
 	.probe		= altera_pio_probe,
 };
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index ef7984374b1..90e692c13ed 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -629,10 +629,10 @@  U_BOOT_DRIVER(atmel_at91rm9200_gpio) = {
 	.id	= UCLASS_GPIO,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = at91_gpio_ids,
-	.platdata_auto_alloc_size = sizeof(struct at91_port_platdata),
+	.platdata_auto	= sizeof(struct at91_port_platdata),
 #endif
 	.ops	= &gpio_at91_ops,
 	.probe	= at91_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct at91_port_priv),
+	.priv_auto	= sizeof(struct at91_port_priv),
 };
 #endif
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 18f365fa411..d92c061928d 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -338,7 +338,7 @@  U_BOOT_DRIVER(gpio_atmel_pio4) = {
 	.probe	= atmel_pio4_probe,
 	.bind	= atmel_pio4_bind,
 	.of_match = atmel_pio4_ids,
-	.platdata_auto_alloc_size = sizeof(struct atmel_pio4_platdata),
+	.platdata_auto	= sizeof(struct atmel_pio4_platdata),
 };
 
 #endif
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index 0dff9ac711d..db349cf24bf 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -134,9 +134,9 @@  U_BOOT_DRIVER(gpio_bcm2835) = {
 	.name	= "gpio_bcm2835",
 	.id	= UCLASS_GPIO,
 	.ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct bcm2835_gpio_platdata),
+	.platdata_auto	= sizeof(struct bcm2835_gpio_platdata),
 	.ops	= &gpio_bcm2835_ops,
 	.probe	= bcm2835_gpio_probe,
 	.flags	= DM_FLAG_PRE_RELOC,
-	.priv_auto_alloc_size = sizeof(struct bcm2835_gpios),
+	.priv_auto	= sizeof(struct bcm2835_gpios),
 };
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 5da11d988e0..e031f71a784 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -114,6 +114,6 @@  U_BOOT_DRIVER(bcm6345_gpio) = {
 	.id = UCLASS_GPIO,
 	.of_match = bcm6345_gpio_ids,
 	.ops = &bcm6345_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_gpio_priv),
+	.priv_auto	= sizeof(struct bcm6345_gpio_priv),
 	.probe = bcm6345_gpio_probe,
 };
diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c
index 055907c1a1d..72ef523be96 100644
--- a/drivers/gpio/cortina_gpio.c
+++ b/drivers/gpio/cortina_gpio.c
@@ -107,7 +107,7 @@  U_BOOT_DRIVER(cortina_gpio) = {
 	.id = UCLASS_GPIO,
 	.ops = &gpio_cortina_ops,
 	.probe = ca_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct cortina_gpio_bank),
+	.priv_auto	= sizeof(struct cortina_gpio_bank),
 	.of_match = ca_gpio_ids,
 };
 #endif /* CONFIG_DM_GPIO */
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index f8758885101..507f8b18c21 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -560,9 +560,9 @@  U_BOOT_DRIVER(ti_dm6441_gpio) = {
 	.ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata),
 	.of_match = davinci_gpio_ids,
 	.bind   = dm_scan_fdt_dev,
-	.platdata_auto_alloc_size = sizeof(struct davinci_gpio_platdata),
+	.platdata_auto	= sizeof(struct davinci_gpio_platdata),
 	.probe	= davinci_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct davinci_gpio_bank),
+	.priv_auto	= sizeof(struct davinci_gpio_bank),
 };
 
 #endif
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index cf20a5024e0..3a868844430 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -237,5 +237,5 @@  U_BOOT_DRIVER(gpio_dwapb) = {
 	.bind		= gpio_dwapb_bind,
 	.probe		= gpio_dwapb_probe,
 	.remove		= gpio_dwapb_remove,
-	.priv_auto_alloc_size   = sizeof(struct gpio_dwapb_priv),
+	.priv_auto	  = sizeof(struct gpio_dwapb_priv),
 };
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index a993fd4d700..beae34f233a 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -189,6 +189,6 @@  U_BOOT_DRIVER(rcar_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = rcar_gpio_ids,
 	.ops	= &rcar_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct rcar_gpio_priv),
+	.priv_auto	= sizeof(struct rcar_gpio_priv),
 	.probe	= rcar_gpio_probe,
 };
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 86804ac2f5f..ee7de4c17e9 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -130,6 +130,6 @@  U_BOOT_DRIVER(r7s72100_gpio) = {
 	.name	= "r7s72100-gpio",
 	.id	= UCLASS_GPIO,
 	.ops	= &r7s72100_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct r7s72100_gpio_priv),
+	.priv_auto	= sizeof(struct r7s72100_gpio_priv),
 	.probe	= r7s72100_gpio_probe,
 };
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 0c01413b587..3fc4cd044fc 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -340,8 +340,8 @@  U_BOOT_DRIVER(gpio_hog) = {
 	.id	= UCLASS_NOP,
 	.ofdata_to_platdata = gpio_hog_ofdata_to_platdata,
 	.probe = gpio_hog_probe,
-	.priv_auto_alloc_size = sizeof(struct gpio_hog_priv),
-	.platdata_auto_alloc_size = sizeof(struct gpio_hog_data),
+	.priv_auto	= sizeof(struct gpio_hog_priv),
+	.platdata_auto	= sizeof(struct gpio_hog_data),
 };
 #else
 int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc)
@@ -1340,5 +1340,5 @@  UCLASS_DRIVER(gpio) = {
 	.post_probe	= gpio_post_probe,
 	.post_bind	= gpio_post_bind,
 	.pre_remove	= gpio_pre_remove,
-	.per_device_auto_alloc_size = sizeof(struct gpio_dev_priv),
+	.per_device_auto	= sizeof(struct gpio_dev_priv),
 };
diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index 54a38da0f10..61c705b5ac5 100644
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -166,6 +166,6 @@  U_BOOT_DRIVER(uniphier_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = uniphier_gpio_match,
 	.probe	= uniphier_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_gpio_priv),
+	.priv_auto	= sizeof(struct uniphier_gpio_priv),
 	.ops	= &uniphier_gpio_ops,
 };
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 95de2ae3660..c49dc78baa5 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -89,7 +89,7 @@  U_BOOT_DRIVER(gpio_hi6220) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_hi6220_ops,
 	.probe	= hi6220_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct gpio_bank),
+	.priv_auto	= sizeof(struct gpio_bank),
 };
 
 
diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c
index 35b114904d5..d40365e82d1 100644
--- a/drivers/gpio/hsdk-creg-gpio.c
+++ b/drivers/gpio/hsdk-creg-gpio.c
@@ -165,5 +165,5 @@  U_BOOT_DRIVER(gpio_hsdk_creg) = {
 	.ops	= &hsdk_creg_gpio_ops,
 	.probe	= hsdk_creg_gpio_probe,
 	.of_match = hsdk_creg_gpio_ids,
-	.platdata_auto_alloc_size = sizeof(struct hsdk_creg_gpio),
+	.platdata_auto	= sizeof(struct hsdk_creg_gpio),
 };
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 428844db0cc..63170413f32 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -200,7 +200,7 @@  U_BOOT_DRIVER(imx_rgpio2p) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &imx_rgpio2p_ops,
 	.probe	= imx_rgpio2p_probe,
-	.priv_auto_alloc_size = sizeof(struct imx_rgpio2p_plat),
+	.priv_auto	= sizeof(struct imx_rgpio2p_plat),
 	.of_match = imx_rgpio2p_ids,
 	.bind	= imx_rgpio2p_bind,
 };
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 95f8b2ba6cd..cb217403cd1 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -184,6 +184,6 @@  U_BOOT_DRIVER(gpio_broadwell) = {
 	.ops	= &gpio_broadwell_ops,
 	.ofdata_to_platdata	= broadwell_gpio_ofdata_to_platdata,
 	.probe	= broadwell_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct broadwell_bank_priv),
-	.platdata_auto_alloc_size = sizeof(struct broadwell_bank_platdata),
+	.priv_auto	= sizeof(struct broadwell_bank_priv),
+	.platdata_auto	= sizeof(struct broadwell_bank_platdata),
 };
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 73d98fde554..bba85b37912 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -236,6 +236,6 @@  U_BOOT_DRIVER(gpio_ich6) = {
 	.ops	= &gpio_ich6_ops,
 	.ofdata_to_platdata	= gpio_ich6_ofdata_to_platdata,
 	.probe	= ich6_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct ich6_bank_priv),
-	.platdata_auto_alloc_size = sizeof(struct ich6_bank_platdata),
+	.priv_auto	= sizeof(struct ich6_bank_priv),
+	.platdata_auto	= sizeof(struct ich6_bank_platdata),
 };
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index 2371d0d0d77..6ef9aa2b5fa 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -286,5 +286,5 @@  U_BOOT_DRIVER(iproc_gpio) = {
 	.of_match		= iproc_gpio_ids,
 	.ops			= &iproc_gpio_ops,
 	.ofdata_to_platdata	= iproc_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size	= sizeof(struct iproc_gpio_platdata),
+	.platdata_auto	= sizeof(struct iproc_gpio_platdata),
 };
diff --git a/drivers/gpio/lpc32xx_gpio.c b/drivers/gpio/lpc32xx_gpio.c
index 1265ee41a60..ffaec32ac2b 100644
--- a/drivers/gpio/lpc32xx_gpio.c
+++ b/drivers/gpio/lpc32xx_gpio.c
@@ -317,5 +317,5 @@  U_BOOT_DRIVER(gpio_lpc32xx) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_lpc32xx_ops,
 	.probe	= lpc32xx_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct lpc32xx_gpio_priv),
+	.priv_auto	= sizeof(struct lpc32xx_gpio_priv),
 };
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index 54dc437e1c4..3020cc9502a 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -141,9 +141,9 @@  U_BOOT_DRIVER(spisel_boot_mpc83xx) = {
 	.ops	= &mpc83xx_spisel_boot_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.ofdata_to_platdata = mpc83xx_spisel_boot_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat),
+	.platdata_auto	= sizeof(struct mpc8xxx_gpio_plat),
 	.of_match = mpc83xx_spisel_boot_ids,
 #endif
 	.probe	= mpc83xx_spisel_boot_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_spisel_boot),
+	.priv_auto	= sizeof(struct mpc83xx_spisel_boot),
 };
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 27881a73224..fa08909b2b9 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -295,9 +295,9 @@  U_BOOT_DRIVER(gpio_mpc8xxx) = {
 	.ops	= &gpio_mpc8xxx_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat),
+	.platdata_auto	= sizeof(struct mpc8xxx_gpio_plat),
 	.of_match = mpc8xxx_gpio_ids,
 #endif
 	.probe	= mpc8xxx_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc8xxx_gpio_data),
+	.priv_auto	= sizeof(struct mpc8xxx_gpio_data),
 };
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 780d77b2f86..1cbcc43489a 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -275,5 +275,5 @@  U_BOOT_DRIVER(gpio_mscc_sgpio) = {
 	.of_match		= mscc_sgpio_ids,
 	.ops			= &mscc_sgpio_ops,
 	.probe			= mscc_sgpio_probe,
-	.priv_auto_alloc_size	= sizeof(struct mscc_sgpio_priv),
+	.priv_auto	= sizeof(struct mscc_sgpio_priv),
 };
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 416fb56a98d..0feafb30ee3 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -129,5 +129,5 @@  U_BOOT_DRIVER(gpio_msm) = {
 	.ofdata_to_platdata = msm_gpio_ofdata_to_platdata,
 	.probe	= msm_gpio_probe,
 	.ops	= &gpio_msm_ops,
-	.priv_auto_alloc_size = sizeof(struct msm_gpio_bank),
+	.priv_auto	= sizeof(struct msm_gpio_bank),
 };
diff --git a/drivers/gpio/mvebu_gpio.c b/drivers/gpio/mvebu_gpio.c
index 3639388e2f7..4c1c68ee19e 100644
--- a/drivers/gpio/mvebu_gpio.c
+++ b/drivers/gpio/mvebu_gpio.c
@@ -117,5 +117,5 @@  U_BOOT_DRIVER(gpio_mvebu) = {
 	.of_match		= mvebu_gpio_ids,
 	.ops			= &mvebu_gpio_ops,
 	.probe			= mvebu_gpio_probe,
-	.priv_auto_alloc_size	= sizeof(struct mvebu_gpio_priv),
+	.priv_auto	= sizeof(struct mvebu_gpio_priv),
 };
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 28ca57149c1..1e00e23116a 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -339,8 +339,8 @@  U_BOOT_DRIVER(gpio_mxc) = {
 	.ops	= &gpio_mxc_ops,
 	.probe	= mxc_gpio_probe,
 	.ofdata_to_platdata = mxc_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mxc_gpio_plat),
-	.priv_auto_alloc_size = sizeof(struct mxc_bank_info),
+	.platdata_auto	= sizeof(struct mxc_gpio_plat),
+	.priv_auto	= sizeof(struct mxc_bank_info),
 	.of_match = mxc_gpio_ids,
 	.bind	= mxc_gpio_bind,
 };
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index aaabb0216be..83147b49190 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -298,8 +298,8 @@  U_BOOT_DRIVER(fsl_imx23_gpio) = {
 	.id	= UCLASS_GPIO,
 	.ops	= &gpio_mxs_ops,
 	.probe	= mxs_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct mxs_gpio_priv),
-	.platdata_auto_alloc_size = sizeof(struct mxs_gpio_platdata),
+	.priv_auto	= sizeof(struct mxs_gpio_priv),
+	.platdata_auto	= sizeof(struct mxs_gpio_platdata),
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = mxs_gpio_ids,
 	.ofdata_to_platdata = mxs_ofdata_to_platdata,
diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c
index 5ec73c43599..1bd12f15686 100644
--- a/drivers/gpio/nx_gpio.c
+++ b/drivers/gpio/nx_gpio.c
@@ -245,6 +245,6 @@  U_BOOT_DRIVER(nx_gpio) = {
 	.of_match	= nx_gpio_ids,
 	.ops		= &nx_gpio_ops,
 	.ofdata_to_platdata = nx_gpio_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct nx_gpio_platdata),
+	.platdata_auto	= sizeof(struct nx_gpio_platdata),
 	.probe		= nx_gpio_probe,
 };
diff --git a/drivers/gpio/octeon_gpio.c b/drivers/gpio/octeon_gpio.c
index f1c67fd006d..958516d8f8e 100644
--- a/drivers/gpio/octeon_gpio.c
+++ b/drivers/gpio/octeon_gpio.c
@@ -236,7 +236,7 @@  U_BOOT_DRIVER(octeon_gpio) = {
 	.id	= UCLASS_GPIO,
 	.of_match = of_match_ptr(octeon_gpio_ids),
 	.probe = octeon_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct octeon_gpio),
+	.priv_auto	= sizeof(struct octeon_gpio),
 	.ops	= &octeon_gpio_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 6eaa0a08a26..9e828058cdf 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -363,14 +363,14 @@  U_BOOT_DRIVER(gpio_omap) = {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_gpio_ids,
 	.ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct omap_gpio_platdata),
+	.platdata_auto	= sizeof(struct omap_gpio_platdata),
 #endif
 #else
 	.bind   = omap_gpio_bind,
 #endif
 	.ops	= &gpio_omap_ops,
 	.probe	= omap_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct gpio_bank),
+	.priv_auto	= sizeof(struct gpio_bank),
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags = DM_FLAG_PRE_RELOC,
 #endif
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index fd17d1a5910..32d4a836131 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -385,6 +385,6 @@  U_BOOT_DRIVER(pca953x) = {
 	.id		= UCLASS_GPIO,
 	.ops		= &pca953x_ops,
 	.probe		= pca953x_probe,
-	.platdata_auto_alloc_size = sizeof(struct pca953x_info),
+	.platdata_auto	= sizeof(struct pca953x_info),
 	.of_match	= pca953x_ids,
 };
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 1b9a18fe5dc..7fcadc79c15 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -177,5 +177,5 @@  U_BOOT_DRIVER(gpio_pcf8575) = {
 	.of_match = pcf8575_gpio_ids,
 	.ofdata_to_platdata = pcf8575_ofdata_platdata,
 	.probe	= pcf8575_gpio_probe,
-	.platdata_auto_alloc_size = sizeof(struct pcf8575_chip),
+	.platdata_auto	= sizeof(struct pcf8575_chip),
 };
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index bb1ad256fac..253a9ba2f84 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -161,5 +161,5 @@  U_BOOT_DRIVER(gpio_pic32) = {
 	.of_match	= pic32_gpio_ids,
 	.ops		= &gpio_pic32_ops,
 	.probe		= pic32_gpio_probe,
-	.priv_auto_alloc_size	= sizeof(struct pic32_gpio_priv),
+	.priv_auto	= sizeof(struct pic32_gpio_priv),
 };
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 58f044678b7..20d5bd55d00 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -212,7 +212,7 @@  U_BOOT_DRIVER(gpio_pm8916) = {
 	.ofdata_to_platdata = pm8916_gpio_ofdata_to_platdata,
 	.probe	= pm8916_gpio_probe,
 	.ops	= &pm8916_gpio_ops,
-	.priv_auto_alloc_size = sizeof(struct pm8916_gpio_bank),
+	.priv_auto	= sizeof(struct pm8916_gpio_bank),
 };
 
 
@@ -297,5 +297,5 @@  U_BOOT_DRIVER(pwrkey_pm8941) = {
 	.ofdata_to_platdata = pm8941_pwrkey_ofdata_to_platdata,
 	.probe	= pm8941_pwrkey_probe,
 	.ops	= &pm8941_pwrkey_ops,
-	.priv_auto_alloc_size = sizeof(struct pm8916_gpio_bank),
+	.priv_auto	= sizeof(struct pm8916_gpio_bank),
 };
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 8cc288581c9..68f30157a9a 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -177,6 +177,6 @@  U_BOOT_DRIVER(rockchip_gpio_bank) = {
 	.id	= UCLASS_GPIO,
 	.of_match = rockchip_gpio_ids,
 	.ops	= &gpio_rockchip_ops,
-	.priv_auto_alloc_size = sizeof(struct rockchip_gpio_priv),
+	.priv_auto	= sizeof(struct rockchip_gpio_priv),
 	.probe	= rockchip_gpio_probe,
 };
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index ec8d54922d3..3fc436759cc 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -365,7 +365,7 @@  U_BOOT_DRIVER(gpio_exynos) = {
 	.of_match = exynos_gpio_ids,
 	.bind	= gpio_exynos_bind,
 	.probe = gpio_exynos_probe,
-	.priv_auto_alloc_size = sizeof(struct exynos_bank_info),
+	.priv_auto	= sizeof(struct exynos_bank_info),
 	.ops	= &gpio_exynos_ops,
 };
 #endif
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index eb2600de311..fa871305baf 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -532,6 +532,6 @@  U_BOOT_DRIVER(sandbox_pinctrl_gpio) = {
 	.ops = &sandbox_pinctrl_gpio_ops,
 	.bind = dm_scan_fdt_dev,
 	.probe = sandbox_pinctrl_probe,
-	.priv_auto_alloc_size	= sizeof(struct sb_pinctrl_priv),
+	.priv_auto	= sizeof(struct sb_pinctrl_priv),
 	ACPI_OPS_PTR(&pinctrl_sandbox_acpi_ops)
 };
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index bf3537b76bd..19239f5db91 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -172,7 +172,7 @@  U_BOOT_DRIVER(gpio_sifive) = {
 	.id	= UCLASS_GPIO,
 	.of_match = sifive_gpio_match,
 	.ofdata_to_platdata = of_match_ptr(sifive_gpio_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct sifive_gpio_platdata),
+	.platdata_auto	= sizeof(struct sifive_gpio_platdata),
 	.ops	= &sifive_gpio_ops,
 	.probe	= sifive_gpio_probe,
 };
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
index 51e1efd7014..79d55e812db 100644
--- a/drivers/gpio/stm32_gpio.c
+++ b/drivers/gpio/stm32_gpio.c
@@ -342,5 +342,5 @@  U_BOOT_DRIVER(gpio_stm32) = {
 	.probe	= gpio_stm32_probe,
 	.ops	= &gpio_stm32_ops,
 	.flags	= DM_UC_FLAG_SEQ_ALIAS,
-	.priv_auto_alloc_size	= sizeof(struct stm32_gpio_priv),
+	.priv_auto	= sizeof(struct stm32_gpio_priv),
 };
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 22d25313227..7583c8d6b26 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -377,6 +377,6 @@  U_BOOT_DRIVER(gpio_tegra) = {
 	.of_match = tegra_gpio_ids,
 	.bind	= gpio_tegra_bind,
 	.probe = gpio_tegra_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra_port_info),
+	.priv_auto	= sizeof(struct tegra_port_info),
 	.ops	= &gpio_tegra_ops,
 };
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 0474d2df2da..3ded586238c 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -132,6 +132,6 @@  U_BOOT_DRIVER(gpio_vybrid) = {
 	.of_match = vybrid_gpio_ids,
 	.ofdata_to_platdata = vybrid_gpio_odata_to_platdata,
 	.probe	= vybrid_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct vybrid_gpios),
-	.platdata_auto_alloc_size = sizeof(struct vybrid_gpio_platdata),
+	.priv_auto	= sizeof(struct vybrid_gpios),
+	.platdata_auto	= sizeof(struct vybrid_gpio_platdata),
 };
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 014f120d609..1bb70b12c92 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -307,6 +307,6 @@  U_BOOT_DRIVER(xilinx_gpio) = {
 	.of_match = xilinx_gpio_ids,
 	.ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata,
 	.probe = xilinx_gpio_probe,
-	.platdata_auto_alloc_size = sizeof(struct xilinx_gpio_platdata),
-	.priv_auto_alloc_size = sizeof(struct xilinx_gpio_privdata),
+	.platdata_auto	= sizeof(struct xilinx_gpio_platdata),
+	.priv_auto	= sizeof(struct xilinx_gpio_privdata),
 };
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index d0e90b8d633..4ef2985e766 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -407,5 +407,5 @@  U_BOOT_DRIVER(gpio_zynq) = {
 	.of_match = zynq_gpio_ids,
 	.ofdata_to_platdata = zynq_gpio_ofdata_to_platdata,
 	.probe	= zynq_gpio_probe,
-	.platdata_auto_alloc_size = sizeof(struct zynq_gpio_platdata),
+	.platdata_auto	= sizeof(struct zynq_gpio_platdata),
 };
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c
index 8be585a0c86..fdc1f6fd53e 100644
--- a/drivers/hwspinlock/stm32_hwspinlock.c
+++ b/drivers/hwspinlock/stm32_hwspinlock.c
@@ -90,5 +90,5 @@  U_BOOT_DRIVER(hwspinlock_stm32mp1) = {
 	.of_match = stm32mp1_hwspinlock_ids,
 	.ops = &stm32mp1_hwspinlock_ops,
 	.probe = stm32mp1_hwspinlock_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32mp1_hws_priv),
+	.priv_auto	= sizeof(struct stm32mp1_hws_priv),
 };
diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index afd4b44100b..a4caba46baf 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -352,6 +352,6 @@  U_BOOT_DRIVER(ast_i2c) = {
 	.of_match = ast_i2c_ids,
 	.probe = ast_i2c_probe,
 	.ofdata_to_platdata = ast_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ast_i2c_priv),
+	.priv_auto	= sizeof(struct ast_i2c_priv),
 	.ops = &ast_i2c_ops,
 };
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index 9d6c6d80e2a..db2fbc9d66d 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -318,7 +318,7 @@  U_BOOT_DRIVER(i2c_at91) = {
 	.of_match = at91_i2c_ids,
 	.probe = at91_i2c_probe,
 	.ofdata_to_platdata = at91_i2c_ofdata_to_platdata,
-	.per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
-	.priv_auto_alloc_size = sizeof(struct at91_i2c_bus),
+	.per_child_auto	= sizeof(struct dm_i2c_chip),
+	.priv_auto	= sizeof(struct at91_i2c_bus),
 	.ops	= &at91_i2c_ops,
 };
diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index a630817352e..1cc5c0618e5 100644
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -56,6 +56,6 @@  U_BOOT_DRIVER(cros_ec_tunnel) = {
 	.id	= UCLASS_I2C,
 	.of_match = cros_ec_i2c_ids,
 	.ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct cros_ec_i2c_bus),
+	.priv_auto	= sizeof(struct cros_ec_i2c_bus),
 	.ops	= &cros_ec_i2c_ops,
 };
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index 478385ad683..7811abad80b 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -504,7 +504,7 @@  U_BOOT_DRIVER(i2c_davinci) = {
 	.id	= UCLASS_I2C,
 	.of_match = davinci_i2c_ids,
 	.probe	= davinci_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct i2c_bus),
+	.priv_auto	= sizeof(struct i2c_bus),
 	.ops	= &davinci_i2c_ops,
 };
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 791f32e971c..c8927ebfeb8 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -842,7 +842,7 @@  U_BOOT_DRIVER(i2c_designware) = {
 	.of_match = designware_i2c_ids,
 	.ofdata_to_platdata = designware_i2c_ofdata_to_platdata,
 	.probe	= designware_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct dw_i2c),
+	.priv_auto	= sizeof(struct dw_i2c),
 	.remove = designware_i2c_remove,
 	.flags	= DM_FLAG_OS_PREPARE,
 	.ops	= &designware_i2c_ops,
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 9237726b475..6e7b6a2c063 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -199,7 +199,7 @@  U_BOOT_DRIVER(i2c_designware_pci) = {
 	.bind	= designware_i2c_pci_bind,
 	.ofdata_to_platdata	= designware_i2c_pci_ofdata_to_platdata,
 	.probe	= designware_i2c_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct dw_i2c),
+	.priv_auto	= sizeof(struct dw_i2c),
 	.remove = designware_i2c_remove,
 	.flags = DM_FLAG_OS_PREPARE,
 	.ops	= &designware_i2c_ops,
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index 87fc9c19940..da8011029dd 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -558,6 +558,6 @@  U_BOOT_DRIVER(hs_i2c) = {
 	.id	= UCLASS_I2C,
 	.of_match = exynos_hs_i2c_ids,
 	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
+	.priv_auto	= sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &exynos_hs_i2c_ops,
 };
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index da933452f51..f55b4751977 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -650,7 +650,7 @@  U_BOOT_DRIVER(i2c_fsl) = {
 	.of_match = fsl_i2c_ids,
 	.probe = fsl_i2c_probe,
 	.ofdata_to_platdata = fsl_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct fsl_i2c_dev),
+	.priv_auto	= sizeof(struct fsl_i2c_dev),
 	.ops = &fsl_i2c_ops,
 };
 
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 7144d39984e..2cf22330e0b 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -504,6 +504,6 @@  U_BOOT_DRIVER(cdns_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = cdns_i2c_of_match,
 	.ofdata_to_platdata = cdns_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct i2c_cdns_bus),
+	.priv_auto	= sizeof(struct i2c_cdns_bus),
 	.ops = &cdns_i2c_ops,
 };
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 036fc4282b5..420dfdbab94 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -341,7 +341,7 @@  U_BOOT_DRIVER(i2c_cortina) = {
 	.of_match = ca_i2c_ids,
 	.ofdata_to_platdata = ca_i2c_ofdata_to_platdata,
 	.probe	= ca_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct ca_i2c),
+	.priv_auto	= sizeof(struct ca_i2c),
 	.ops	= &ca_i2c_ops,
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c
index 84b6a219d19..956ebeefb61 100644
--- a/drivers/i2c/i2c-emul-uclass.c
+++ b/drivers/i2c/i2c-emul-uclass.c
@@ -64,14 +64,14 @@  int i2c_emul_find(struct udevice *dev, struct udevice **emulp)
 UCLASS_DRIVER(i2c_emul) = {
 	.id		= UCLASS_I2C_EMUL,
 	.name		= "i2c_emul",
-	.per_device_platdata_auto_alloc_size =
+	.per_device_platdata_auto	=
 		 sizeof(struct i2c_emul_uc_platdata),
 };
 
 /*
  * This uclass is a child of the i2c bus. Its platdata is not defined here so
  * is defined by its parent, UCLASS_I2C, which uses struct dm_i2c_chip. See
- * per_child_platdata_auto_alloc_size in UCLASS_DRIVER(i2c).
+ * per_child_platdata_auto	in UCLASS_DRIVER(i2c).
  */
 UCLASS_DRIVER(i2c_emul_parent) = {
 	.id		= UCLASS_I2C_EMUL_PARENT,
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 3eb31672bec..0f363da4188 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -372,6 +372,6 @@  U_BOOT_DRIVER(i2c_gpio) = {
 	.of_match = i2c_gpio_ids,
 	.probe	= i2c_gpio_drv_probe,
 	.ofdata_to_platdata = i2c_gpio_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct i2c_gpio_bus),
+	.priv_auto	= sizeof(struct i2c_gpio_bus),
 	.ops	= &i2c_gpio_ops,
 };
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 2625bd72dc8..3ef0188af27 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -733,11 +733,11 @@  UCLASS_DRIVER(i2c) = {
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_bind	= i2c_post_bind,
 	.init		= i2c_uclass_init,
-	.priv_auto_alloc_size = sizeof(struct i2c_priv),
+	.priv_auto	= sizeof(struct i2c_priv),
 	.pre_probe      = i2c_pre_probe,
 	.post_probe	= i2c_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct dm_i2c_bus),
-	.per_child_platdata_auto_alloc_size = sizeof(struct dm_i2c_chip),
+	.per_device_auto	= sizeof(struct dm_i2c_bus),
+	.per_child_platdata_auto	= sizeof(struct dm_i2c_chip),
 	.child_post_bind = i2c_child_post_bind,
 };
 
@@ -760,7 +760,7 @@  U_BOOT_DRIVER(i2c_generic_chip_drv) = {
 	.of_match	= generic_chip_i2c_ids,
 #if CONFIG_IS_ENABLED(ACPIGEN)
 	.ofdata_to_platdata	= acpi_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct acpi_i2c_priv),
+	.priv_auto	= sizeof(struct acpi_i2c_priv),
 #endif
 	ACPI_OPS_PTR(&acpi_i2c_ops)
 };
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index a110fe9e8d9..9d6f1688cb1 100644
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -326,6 +326,6 @@  U_BOOT_DRIVER(uniphier_fi2c) = {
 	.id = UCLASS_I2C,
 	.of_match = uniphier_fi2c_of_match,
 	.probe = uniphier_fi2c_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_fi2c_priv),
+	.priv_auto	= sizeof(struct uniphier_fi2c_priv),
 	.ops = &uniphier_fi2c_ops,
 };
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index e7f44e14e9c..6eafbeeef4e 100644
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -214,6 +214,6 @@  U_BOOT_DRIVER(uniphier_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = uniphier_i2c_of_match,
 	.probe = uniphier_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_i2c_priv),
+	.priv_auto	= sizeof(struct uniphier_i2c_priv),
 	.ops = &uniphier_i2c_ops,
 };
diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c
index 69042d54205..0a1a85dfc28 100644
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@@ -272,6 +272,6 @@  U_BOOT_DRIVER(versatile_i2c) = {
 	.id = UCLASS_I2C,
 	.of_match = versatile_i2c_of_match,
 	.probe = versatile_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct versatile_i2c_priv),
+	.priv_auto	= sizeof(struct versatile_i2c_priv),
 	.ops = &versatile_i2c_ops,
 };
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index cec38538da4..f91a96a3aa3 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -354,7 +354,7 @@  U_BOOT_DRIVER(i2c_ihs) = {
 	.id = UCLASS_I2C,
 	.of_match = ihs_i2c_ids,
 	.probe = ihs_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct ihs_i2c_priv),
+	.priv_auto	= sizeof(struct ihs_i2c_priv),
 	.ops = &ihs_i2c_ops,
 };
 
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index a4e8ab795d4..92c500327b4 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -519,6 +519,6 @@  U_BOOT_DRIVER(imx_lpi2c) = {
 	.id = UCLASS_I2C,
 	.of_match = imx_lpi2c_ids,
 	.probe = imx_lpi2c_probe,
-	.priv_auto_alloc_size = sizeof(struct imx_lpi2c_bus),
+	.priv_auto	= sizeof(struct imx_lpi2c_bus),
 	.ops = &imx_lpi2c_ops,
 };
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 66d017a2615..52f7a528efe 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -296,7 +296,7 @@  U_BOOT_DRIVER(intel_i2c) = {
 	.id	= UCLASS_I2C,
 	.of_match = intel_i2c_ids,
 	.ops	= &intel_i2c_ops,
-	.priv_auto_alloc_size = sizeof(struct intel_i2c),
+	.priv_auto	= sizeof(struct intel_i2c),
 	.bind	= intel_i2c_bind,
 	.probe	= intel_i2c_probe,
 };
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b7e9ced8983..20e25957330 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -707,7 +707,7 @@  U_BOOT_DRIVER(iproc_i2c) = {
 	.of_match = iproc_i2c_ids,
 	.ofdata_to_platdata = iproc_i2c_ofdata_to_platdata,
 	.probe	= iproc_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct iproc_i2c),
+	.priv_auto	= sizeof(struct iproc_i2c),
 	.ops	= &iproc_i2c_ops,
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index e070caf43f2..434e3461b1d 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -308,6 +308,6 @@  U_BOOT_DRIVER(i2c_meson) = {
 	.id   = UCLASS_I2C,
 	.of_match = meson_i2c_ids,
 	.probe = meson_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_i2c),
+	.priv_auto	= sizeof(struct meson_i2c),
 	.ops = &meson_i2c_ops,
 };
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 584d0a4fef1..928e02b7af1 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -145,5 +145,5 @@  U_BOOT_DRIVER(i2c_arbitrator) = {
 	.probe = i2c_arbitrator_probe,
 	.remove = i2c_arbitrator_remove,
 	.ops = &i2c_arbitrator_ops,
-	.priv_auto_alloc_size = sizeof(struct i2c_arbitrator_priv),
+	.priv_auto	= sizeof(struct i2c_arbitrator_priv),
 };
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 83dcb402133..8d6e208a0b8 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -136,5 +136,5 @@  U_BOOT_DRIVER(i2c_mux_gpio) = {
 	.of_match = i2c_mux_gpio_ids,
 	.ops = &i2c_mux_gpio_ops,
 	.probe = i2c_mux_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct i2c_mux_gpio_priv),
+	.priv_auto	= sizeof(struct i2c_mux_gpio_priv),
 };
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 9a8cf8fb172..f40a9c95df1 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -220,7 +220,7 @@  UCLASS_DRIVER(i2c_mux) = {
 	.name		= "i2c_mux",
 	.post_bind	= i2c_mux_post_bind,
 	.post_probe	= i2c_mux_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct i2c_mux),
-	.per_child_platdata_auto_alloc_size = sizeof(struct i2c_mux_bus),
+	.per_device_auto	= sizeof(struct i2c_mux),
+	.per_child_platdata_auto	= sizeof(struct i2c_mux_bus),
 	.child_post_bind = i2c_mux_child_post_bind,
 };
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 7360e162eeb..06efe846765 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -172,5 +172,5 @@  U_BOOT_DRIVER(pca954x) = {
 	.remove = pca954x_remove,
 	.ops = &pca954x_ops,
 	.ofdata_to_platdata = pca954x_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct pca954x_priv),
+	.priv_auto	= sizeof(struct pca954x_priv),
 };
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 82e8fdac413..ef1007de142 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -600,7 +600,7 @@  U_BOOT_DRIVER(i2c_mv) = {
 	.id	= UCLASS_I2C,
 	.of_match = mv_i2c_ids,
 	.probe	= mv_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct mv_i2c_priv),
+	.priv_auto	= sizeof(struct mv_i2c_priv),
 	.ops	= &mv_i2c_ops,
 };
 #endif /* CONFIG_DM_I2C */
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 5cec4d68c90..d29bd78a7a0 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -888,7 +888,7 @@  U_BOOT_DRIVER(i2c_mvtwsi) = {
 	.bind = mvtwsi_i2c_bind,
 	.probe = mvtwsi_i2c_probe,
 	.ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct mvtwsi_i2c_dev),
+	.priv_auto	= sizeof(struct mvtwsi_i2c_dev),
 	.ops = &mvtwsi_i2c_ops,
 };
 #endif /* CONFIG_DM_I2C */
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index d7f8e821aca..cbc2bbf5d39 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -1072,7 +1072,7 @@  U_BOOT_DRIVER(i2c_mxc) = {
 	.id = UCLASS_I2C,
 	.of_match = mxc_i2c_ids,
 	.probe = mxc_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct mxc_i2c_bus),
+	.priv_auto	= sizeof(struct mxc_i2c_bus),
 	.ops = &mxc_i2c_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index 3f0e7124b72..c63a7325576 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -621,6 +621,6 @@  U_BOOT_DRIVER(i2c_nexell) = {
 	.id		= UCLASS_I2C,
 	.of_match	= nx_i2c_ids,
 	.probe		= nx_i2c_probe,
-	.priv_auto_alloc_size	= sizeof(struct nx_i2c_bus),
+	.priv_auto	= sizeof(struct nx_i2c_bus),
 	.ops		= &nx_i2c_ops,
 };
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index 85ad357eca9..ea2cc33f9de 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -834,6 +834,6 @@  U_BOOT_DRIVER(octeon_pci_twsi) = {
 	.id	= UCLASS_I2C,
 	.of_match = octeon_i2c_ids,
 	.probe	= octeon_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct octeon_twsi),
+	.priv_auto	= sizeof(struct octeon_twsi),
 	.ops	= &octeon_i2c_ops,
 };
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 0af4e333c41..bdb4f079e9d 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -1094,10 +1094,10 @@  U_BOOT_DRIVER(i2c_omap) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_i2c_ids,
 	.ofdata_to_platdata = omap_i2c_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct omap_i2c_platdata),
+	.platdata_auto	= sizeof(struct omap_i2c_platdata),
 #endif
 	.probe	= omap_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct omap_i2c),
+	.priv_auto	= sizeof(struct omap_i2c),
 	.ops	= &omap_i2c_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags  = DM_FLAG_PRE_RELOC,
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 663c342cd83..14bb6603d59 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -371,6 +371,6 @@  U_BOOT_DRIVER(i2c_rcar) = {
 	.id		= UCLASS_I2C,
 	.of_match	= rcar_i2c_ids,
 	.probe		= rcar_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct rcar_i2c_priv),
+	.priv_auto	= sizeof(struct rcar_i2c_priv),
 	.ops		= &rcar_i2c_ops,
 };
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index cad0a623d36..f0e50914c68 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -269,6 +269,6 @@  U_BOOT_DRIVER(iic_rcar) = {
 	.id		= UCLASS_I2C,
 	.of_match	= rcar_iic_ids,
 	.probe		= rcar_iic_probe,
-	.priv_auto_alloc_size = sizeof(struct rcar_iic_priv),
+	.priv_auto	= sizeof(struct rcar_iic_priv),
 	.ops		= &rcar_iic_ops,
 };
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 659461088b7..e9717e530c3 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -491,7 +491,7 @@  U_BOOT_DRIVER(rockchip_rk3066_i2c) = {
 	.of_match = rockchip_i2c_ids,
 	.ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata,
 	.probe	= rockchip_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct rk_i2c),
+	.priv_auto	= sizeof(struct rk_i2c),
 	.ops	= &rockchip_i2c_ops,
 };
 
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 29ba217e709..b4b8e6b1b65 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -343,6 +343,6 @@  U_BOOT_DRIVER(i2c_s3c) = {
 	.id	= UCLASS_I2C,
 	.of_match = s3c_i2c_ids,
 	.ofdata_to_platdata = s3c_i2c_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus),
+	.priv_auto	= sizeof(struct s3c24x0_i2c_bus),
 	.ops	= &s3c_i2c_ops,
 };
diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 2cbdaf9cc73..3abd05324af 100644
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -98,5 +98,5 @@  U_BOOT_DRIVER(sandbox_i2c) = {
 	.id	= UCLASS_I2C,
 	.of_match = sandbox_i2c_ids,
 	.ops	= &sandbox_i2c_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_i2c_priv),
+	.priv_auto	= sizeof(struct sandbox_i2c_priv),
 };
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 2f609115494..483d83409f7 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -955,6 +955,6 @@  U_BOOT_DRIVER(stm32f7_i2c) = {
 	.of_match = stm32_i2c_of_match,
 	.ofdata_to_platdata = stm32_ofdata_to_platdata,
 	.probe = stm32_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_i2c_priv),
+	.priv_auto	= sizeof(struct stm32_i2c_priv),
 	.ops = &stm32_i2c_ops,
 };
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 37204718ca1..88e4e9a5c9d 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -122,6 +122,6 @@  U_BOOT_DRIVER(i2c_gpio) = {
 	.id	= UCLASS_I2C,
 	.of_match = tegra186_bpmp_i2c_ids,
 	.probe	= tegra186_bpmp_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra186_bpmp_i2c),
+	.priv_auto	= sizeof(struct tegra186_bpmp_i2c),
 	.ops	= &tegra186_bpmp_i2c_ops,
 };
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 19212020e84..1e744845423 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -524,6 +524,6 @@  U_BOOT_DRIVER(i2c_tegra) = {
 	.id	= UCLASS_I2C,
 	.of_match = tegra_i2c_ids,
 	.probe	= tegra_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct i2c_bus),
+	.priv_auto	= sizeof(struct i2c_bus),
 	.ops	= &tegra_i2c_ops,
 };
diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c
index 149bd327bdf..72199a62b2d 100644
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@@ -348,6 +348,6 @@  U_BOOT_DRIVER(xilinx_xiic) = {
 	.id		= UCLASS_I2C,
 	.of_match	= xilinx_xiic_ids,
 	.probe		= xilinx_xiic_probe,
-	.priv_auto_alloc_size = sizeof(struct xilinx_xiic_priv),
+	.priv_auto	= sizeof(struct xilinx_xiic_priv),
 	.ops		= &xilinx_xiic_ops,
 };
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 0c0f52205b2..dc3b08c0f66 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -251,5 +251,5 @@  U_BOOT_DRIVER(google_cros_ec_keyb) = {
 	.of_match = cros_ec_kbd_ids,
 	.probe = cros_ec_kbd_probe,
 	.ops	= &cros_ec_kbd_ops,
-	.priv_auto_alloc_size = sizeof(struct cros_ec_keyb_priv),
+	.priv_auto	= sizeof(struct cros_ec_keyb_priv),
 };
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 7beaccca2c8..1ea11fd67b4 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -357,5 +357,5 @@  U_BOOT_DRIVER(i8042_kbd) = {
 	.probe = i8042_kbd_probe,
 	.remove = i8042_kbd_remove,
 	.ops	= &i8042_kbd_ops,
-	.priv_auto_alloc_size = sizeof(struct i8042_kbd_priv),
+	.priv_auto	= sizeof(struct i8042_kbd_priv),
 };
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index f19934e6bb6..2c6680337d9 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -87,5 +87,5 @@  UCLASS_DRIVER(keyboard) = {
 	.id		= UCLASS_KEYBOARD,
 	.name		= "keyboard",
 	.pre_probe	= keyboard_pre_probe,
-	.per_device_auto_alloc_size = sizeof(struct keyboard_priv),
+	.per_device_auto	= sizeof(struct keyboard_priv),
 };
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index f07a51dc307..5113041d3e5 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -350,5 +350,5 @@  U_BOOT_DRIVER(tegra_kbd) = {
 	.of_match = tegra_kbd_ids,
 	.probe = tegra_kbd_probe,
 	.ops	= &tegra_kbd_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra_kbd_priv),
+	.priv_auto	= sizeof(struct tegra_kbd_priv),
 };
diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index 2859475a6b8..d20e28dc616 100644
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -96,5 +96,5 @@  int led_default_state(void)
 UCLASS_DRIVER(led) = {
 	.id		= UCLASS_LED,
 	.name		= "led",
-	.per_device_platdata_auto_alloc_size = sizeof(struct led_uc_plat),
+	.per_device_platdata_auto	= sizeof(struct led_uc_plat),
 };
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 52946835de3..dbe9ab15a50 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -241,5 +241,5 @@  U_BOOT_DRIVER(bcm6328_led) = {
 	.ops = &bcm6328_led_ops,
 	.bind = bcm6328_led_bind,
 	.probe = bcm6328_led_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6328_led_priv),
+	.priv_auto	= sizeof(struct bcm6328_led_priv),
 };
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index 307d418a178..4bf4a09a0a5 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -210,6 +210,6 @@  U_BOOT_DRIVER(bcm6358_led) = {
 	.of_match = bcm6358_led_ids,
 	.bind = bcm6358_led_bind,
 	.probe = bcm6358_led_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6358_led_priv),
+	.priv_auto	= sizeof(struct bcm6358_led_priv),
 	.ops = &bcm6358_led_ops,
 };
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index 511185ffad7..0b1379dfd88 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -247,6 +247,6 @@  U_BOOT_DRIVER(bcm6858_led) = {
 	.of_match = bcm6858_led_ids,
 	.bind = bcm6858_led_bind,
 	.probe = bcm6858_led_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6858_led_priv),
+	.priv_auto	= sizeof(struct bcm6858_led_priv),
 	.ops = &bcm6858_led_ops,
 };
diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c
index 8fd6fd15396..b8760bef393 100644
--- a/drivers/led/led_cortina.c
+++ b/drivers/led/led_cortina.c
@@ -292,7 +292,7 @@  U_BOOT_DRIVER(cortina_led) = {
 	.ofdata_to_platdata = ca_led_ofdata_to_platdata,
 	.bind = cortina_led_bind,
 	.probe = cortina_led_probe,
-	.platdata_auto_alloc_size = sizeof(struct cortina_led_platdata),
-	.priv_auto_alloc_size = sizeof(struct cortina_led_cfg),
+	.platdata_auto	= sizeof(struct cortina_led_platdata),
+	.priv_auto	= sizeof(struct cortina_led_cfg),
 	.ops = &cortina_led_ops,
 };
diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index 2cdb0269f41..fe18ae3eed1 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -128,7 +128,7 @@  U_BOOT_DRIVER(led_gpio) = {
 	.id	= UCLASS_LED,
 	.of_match = led_gpio_ids,
 	.ops	= &gpio_led_ops,
-	.priv_auto_alloc_size = sizeof(struct led_gpio_priv),
+	.priv_auto	= sizeof(struct led_gpio_priv),
 	.bind	= led_gpio_bind,
 	.probe	= led_gpio_probe,
 	.remove	= led_gpio_remove,
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index 27ccc6eab06..8dd93a3e11e 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -438,6 +438,6 @@  U_BOOT_DRIVER(k3_sec_proxy) = {
 	.of_match = k3_sec_proxy_ids,
 	.probe = k3_sec_proxy_probe,
 	.remove = k3_sec_proxy_remove,
-	.priv_auto_alloc_size = sizeof(struct k3_sec_proxy_mbox),
+	.priv_auto	= sizeof(struct k3_sec_proxy_mbox),
 	.ops = &k3_sec_proxy_mbox_ops,
 };
diff --git a/drivers/mailbox/sandbox-mbox-test.c b/drivers/mailbox/sandbox-mbox-test.c
index faca8fcc441..ffd4674d1ef 100644
--- a/drivers/mailbox/sandbox-mbox-test.c
+++ b/drivers/mailbox/sandbox-mbox-test.c
@@ -50,5 +50,5 @@  U_BOOT_DRIVER(sandbox_mbox_test) = {
 	.name = "sandbox_mbox_test",
 	.id = UCLASS_MISC,
 	.of_match = sandbox_mbox_test_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_mbox_test),
+	.priv_auto	= sizeof(struct sandbox_mbox_test),
 };
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 19704dd5da9..87d38de0cb6 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -100,6 +100,6 @@  U_BOOT_DRIVER(sandbox_mbox) = {
 	.of_match = sandbox_mbox_ids,
 	.bind = sandbox_mbox_bind,
 	.probe = sandbox_mbox_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_mbox),
+	.priv_auto	= sizeof(struct sandbox_mbox),
 	.ops = &sandbox_mbox_mbox_ops,
 };
diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index 81a41159863..093b570414f 100644
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -163,6 +163,6 @@  U_BOOT_DRIVER(stm32_ipcc) = {
 	.id = UCLASS_MAILBOX,
 	.of_match = stm32_ipcc_ids,
 	.probe = stm32_ipcc_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_ipcc),
+	.priv_auto	= sizeof(struct stm32_ipcc),
 	.ops = &stm32_ipcc_mbox_ops,
 };
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index e91dac201d2..1d66d95fe48 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -189,6 +189,6 @@  U_BOOT_DRIVER(tegra_hsp) = {
 	.of_match = tegra_hsp_ids,
 	.bind = tegra_hsp_bind,
 	.probe = tegra_hsp_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra_hsp),
+	.priv_auto	= sizeof(struct tegra_hsp),
 	.ops = &tegra_hsp_mbox_ops,
 };
diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index 847a03648b8..959cce923c5 100644
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -137,6 +137,6 @@  U_BOOT_DRIVER(zynqmp_ipi) = {
 	.id = UCLASS_MAILBOX,
 	.of_match = zynqmp_ipi_ids,
 	.probe = zynqmp_ipi_probe,
-	.priv_auto_alloc_size = sizeof(struct zynqmp_ipi),
+	.priv_auto	= sizeof(struct zynqmp_ipi),
 	.ops = &zynqmp_ipi_mbox_ops,
 };
diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c
index d887a1e09d0..f3f48f8b38d 100644
--- a/drivers/memory/stm32-fmc2-ebi.c
+++ b/drivers/memory/stm32-fmc2-ebi.c
@@ -1051,6 +1051,6 @@  U_BOOT_DRIVER(stm32_fmc2_ebi) = {
 	.id = UCLASS_NOP,
 	.of_match = stm32_fmc2_ebi_match,
 	.probe = stm32_fmc2_ebi_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_fmc2_ebi),
+	.priv_auto	= sizeof(struct stm32_fmc2_ebi),
 	.bind = dm_scan_fdt_dev,
 };
diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index c6502650b75..509fd7eb550 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -94,6 +94,6 @@  U_BOOT_DRIVER(altera_sysid) = {
 	.id	= UCLASS_MISC,
 	.of_match = altera_sysid_ids,
 	.ofdata_to_platdata = altera_sysid_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_sysid_platdata),
+	.platdata_auto	= sizeof(struct altera_sysid_platdata),
 	.ops	= &altera_sysid_ops,
 };
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 422ea6f3e5a..bacd47e60f1 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -407,5 +407,5 @@  U_BOOT_DRIVER(atsha204) = {
 	.id			= UCLASS_MISC,
 	.of_match		= atsha204a_ids,
 	.ofdata_to_platdata	= atsha204a_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(fdt_addr_t),
+	.priv_auto	= sizeof(fdt_addr_t),
 };
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 1b22f1883ee..f03b7d55d64 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -1505,7 +1505,7 @@  int cros_ec_set_lid_shutdown_mask(struct udevice *dev, int enable)
 UCLASS_DRIVER(cros_ec) = {
 	.id		= UCLASS_CROS_EC,
 	.name		= "cros-ec",
-	.per_device_auto_alloc_size = sizeof(struct cros_ec_dev),
+	.per_device_auto	= sizeof(struct cros_ec_dev),
 	.post_bind	= dm_scan_fdt_dev,
 	.flags		= DM_UC_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index d72db3eace9..b3bb537c59b 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -585,6 +585,6 @@  U_BOOT_DRIVER(google_cros_ec_sandbox) = {
 	.id		= UCLASS_CROS_EC,
 	.of_match	= cros_ec_ids,
 	.probe		= cros_ec_probe,
-	.priv_auto_alloc_size = sizeof(struct ec_state),
+	.priv_auto	= sizeof(struct ec_state),
 	.ops		= &cros_ec_ops,
 };
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index 56406aa1dd2..71e20a49278 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -285,8 +285,8 @@  U_BOOT_DRIVER(fs_loader) = {
 	.of_match		= fs_loader_ids,
 	.probe			= fs_loader_probe,
 	.ofdata_to_platdata	= fs_loader_ofdata_to_platdata,
-	.platdata_auto_alloc_size	= sizeof(struct device_platdata),
-	.priv_auto_alloc_size	= sizeof(struct firmware),
+	.platdata_auto	= sizeof(struct device_platdata),
+	.priv_auto	= sizeof(struct firmware),
 };
 
 UCLASS_DRIVER(fs_loader) = {
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 69e16a06a0a..145cfa23c6c 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -206,5 +206,5 @@  U_BOOT_DRIVER(gdsys_ioep) = {
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.of_match       = gdsys_ioep_ids,
 	.probe          = gdsys_ioep_probe,
-	.priv_auto_alloc_size = sizeof(struct gdsys_ioep_priv),
+	.priv_auto	= sizeof(struct gdsys_ioep_priv),
 };
diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c
index c56abce4d4c..8f5cbe420f8 100644
--- a/drivers/misc/gdsys_rxaui_ctrl.c
+++ b/drivers/misc/gdsys_rxaui_ctrl.c
@@ -77,5 +77,5 @@  U_BOOT_DRIVER(gdsys_rxaui_ctrl) = {
 	.ops		= &gdsys_rxaui_ctrl_ops,
 	.of_match       = gdsys_rxaui_ctrl_ids,
 	.probe          = gdsys_rxaui_ctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct gdsys_rxaui_ctrl_priv),
+	.priv_auto	= sizeof(struct gdsys_rxaui_ctrl_priv),
 };
diff --git a/drivers/misc/gdsys_soc.c b/drivers/misc/gdsys_soc.c
index b4c721c6fe6..27e7dc48327 100644
--- a/drivers/misc/gdsys_soc.c
+++ b/drivers/misc/gdsys_soc.c
@@ -71,5 +71,5 @@  U_BOOT_DRIVER(gdsys_soc_bus) = {
 	.id             = UCLASS_SIMPLE_BUS,
 	.of_match       = gdsys_soc_ids,
 	.probe          = gdsys_soc_probe,
-	.priv_auto_alloc_size = sizeof(struct gdsys_soc_priv),
+	.priv_auto	= sizeof(struct gdsys_soc_priv),
 };
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 92e18356254..3499114394d 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -284,7 +284,7 @@  U_BOOT_DRIVER(i2c_eeprom_std) = {
 	.bind			= i2c_eeprom_std_bind,
 	.probe			= i2c_eeprom_std_probe,
 	.ofdata_to_platdata	= i2c_eeprom_std_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct i2c_eeprom),
+	.priv_auto	= sizeof(struct i2c_eeprom),
 	.ops			= &i2c_eeprom_std_ops,
 };
 
@@ -366,7 +366,7 @@  U_BOOT_DRIVER(i2c_eeprom_partition) = {
 	.id			= UCLASS_I2C_EEPROM,
 	.probe			= i2c_eeprom_partition_probe,
 	.ofdata_to_platdata	= i2c_eeprom_partition_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct i2c_eeprom_partition),
+	.priv_auto	= sizeof(struct i2c_eeprom_partition),
 	.ops			= &i2c_eeprom_partition_ops,
 };
 
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 6be76ad02ef..2089df1e008 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -200,7 +200,7 @@  U_BOOT_DRIVER(sandbox_i2c_emul) = {
 	.ofdata_to_platdata = sandbox_i2c_eeprom_ofdata_to_platdata,
 	.probe		= sandbox_i2c_eeprom_probe,
 	.remove		= sandbox_i2c_eeprom_remove,
-	.priv_auto_alloc_size = sizeof(struct sandbox_i2c_flash),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_i2c_flash_plat_data),
+	.priv_auto	= sizeof(struct sandbox_i2c_flash),
+	.platdata_auto	= sizeof(struct sandbox_i2c_flash_plat_data),
 	.ops		= &sandbox_i2c_emul_ops,
 };
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 00d34a3adc2..a0fece985d8 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -866,5 +866,5 @@  U_BOOT_DRIVER(ihs_fpga_bus) = {
 	.id             = UCLASS_MISC,
 	.of_match       = ihs_fpga_ids,
 	.probe          = ihs_fpga_probe,
-	.priv_auto_alloc_size = sizeof(struct ihs_fpga_priv),
+	.priv_auto	= sizeof(struct ihs_fpga_priv),
 };
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 223aac8518a..5a2a0e6c523 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -245,6 +245,6 @@  U_BOOT_DRIVER(imx8_scu) = {
 	.bind		= imx8_scu_bind,
 	.remove		= imx8_scu_remove,
 	.ops		= &imx8_scu_ops,
-	.platdata_auto_alloc_size = sizeof(struct imx8_scu),
+	.platdata_auto	= sizeof(struct imx8_scu),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index a2511b32fcd..1f7e62e6614 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -108,5 +108,5 @@  U_BOOT_DRIVER(sandbox_irq_drv) = {
 	.id		= UCLASS_IRQ,
 	.of_match	= sandbox_irq_ids,
 	.ops		= &sandbox_irq_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_irq_priv),
+	.priv_auto	= sizeof(struct sandbox_irq_priv),
 };
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 408c89315a9..840148d0900 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -390,5 +390,5 @@  U_BOOT_DRIVER(k3_avs) = {
 	.of_match = k3_avs_ids,
 	.id = UCLASS_MISC,
 	.probe = k3_avs_probe,
-	.priv_auto_alloc_size = sizeof(struct k3_avs_privdata),
+	.priv_auto	= sizeof(struct k3_avs_privdata),
 };
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index 64cc4ae7b61..43a539e942e 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -62,5 +62,5 @@  U_BOOT_DRIVER(microchip_flexcom) = {
 	.id	= UCLASS_MISC,
 	.of_match = microchip_flexcom_ids,
 	.ofdata_to_platdata = microchip_flexcom_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct microchip_flexcom_platdata),
+	.platdata_auto	= sizeof(struct microchip_flexcom_platdata),
 };
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index f7c5b2e25fa..0e4292fd0aa 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -129,5 +129,5 @@  U_BOOT_DRIVER(misc_sandbox) = {
 	.ops		= &misc_sandbox_ops,
 	.of_match       = misc_sandbox_ids,
 	.probe          = misc_sandbox_probe,
-	.priv_auto_alloc_size = sizeof(struct misc_sandbox_priv),
+	.priv_auto	= sizeof(struct misc_sandbox_priv),
 };
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index ab1e34e6f46..93c87e998c4 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -183,5 +183,5 @@  U_BOOT_DRIVER(mpc83xx_serdes) = {
 	.id             = UCLASS_MISC,
 	.of_match       = mpc83xx_serdes_ids,
 	.probe          = mpc83xx_serdes_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_serdes_priv),
+	.priv_auto	= sizeof(struct mpc83xx_serdes_priv),
 };
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 12abcff2da4..e41c2cd4814 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -221,9 +221,9 @@  static int p2sb_post_bind(struct udevice *dev)
 UCLASS_DRIVER(p2sb) = {
 	.id		= UCLASS_P2SB,
 	.name		= "p2sb",
-	.per_device_auto_alloc_size = sizeof(struct p2sb_uc_priv),
+	.per_device_auto	= sizeof(struct p2sb_uc_priv),
 	.post_bind	= p2sb_post_bind,
 	.child_post_bind = p2sb_child_post_bind,
-	.per_child_platdata_auto_alloc_size =
+	.per_child_platdata_auto	=
 		sizeof(struct p2sb_child_platdata),
 };
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index a4b6dba5162..acdc2c099b4 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -262,8 +262,8 @@  U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = {
 	.id		= UCLASS_PCI_EMUL,
 	.of_match	= sandbox_p2sb_emul_ids,
 	.ops		= &sandbox_p2sb_emul_emul_ops,
-	.priv_auto_alloc_size = sizeof(struct p2sb_emul_priv),
-	.platdata_auto_alloc_size = sizeof(struct p2sb_emul_platdata),
+	.priv_auto	= sizeof(struct p2sb_emul_priv),
+	.platdata_auto	= sizeof(struct p2sb_emul_platdata),
 };
 
 static struct pci_device_id sandbox_p2sb_emul_supported[] = {
diff --git a/drivers/misc/p2sb_sandbox.c b/drivers/misc/p2sb_sandbox.c
index ce50a9732ee..d80bca22a6b 100644
--- a/drivers/misc/p2sb_sandbox.c
+++ b/drivers/misc/p2sb_sandbox.c
@@ -35,5 +35,5 @@  U_BOOT_DRIVER(p2sb_sandbox) = {
 	.id = UCLASS_P2SB,
 	.of_match = sandbox_p2sb_ids,
 	.probe = sandbox_p2sb_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_p2sb_priv),
+	.priv_auto	= sizeof(struct sandbox_p2sb_priv),
 };
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 46ce6305fe6..447b180231d 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -155,6 +155,6 @@  U_BOOT_DRIVER(rockchip_efuse) = {
 	.id = UCLASS_MISC,
 	.of_match = rockchip_efuse_ids,
 	.ofdata_to_platdata = rockchip_efuse_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rockchip_efuse_platdata),
+	.platdata_auto	= sizeof(struct rockchip_efuse_platdata),
 	.ops = &rockchip_efuse_ops,
 };
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index bdd443b3db9..139855adc4d 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -172,5 +172,5 @@  U_BOOT_DRIVER(rockchip_otp) = {
 	.of_match = rockchip_otp_ids,
 	.ops = &rockchip_otp_ops,
 	.ofdata_to_platdata = rockchip_otp_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rockchip_otp_platdata),
+	.platdata_auto	= sizeof(struct rockchip_otp_platdata),
 };
diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c
index df262e62555..fed7ecfb929 100644
--- a/drivers/misc/sandbox_adder.c
+++ b/drivers/misc/sandbox_adder.c
@@ -56,5 +56,5 @@  U_BOOT_DRIVER(adder_sandbox) = {
 	.of_match = sandbox_adder_ids,
 	.probe = sandbox_adder_probe,
 	.ops = &sandbox_adder_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_adder_priv),
+	.priv_auto	= sizeof(struct sandbox_adder_priv),
 };
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 92f08dde011..3dab126f3a6 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -270,6 +270,6 @@  U_BOOT_DRIVER(sifive_otp) = {
 	.id = UCLASS_MISC,
 	.of_match = sifive_otp_ids,
 	.ofdata_to_platdata = sifive_otp_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sifive_otp_platdata),
+	.platdata_auto	= sizeof(struct sifive_otp_platdata),
 	.ops = &sifive_otp_ops,
 };
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 07c67577d54..d75df8e9639 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -391,8 +391,8 @@  U_BOOT_DRIVER(sandbox_swap_case_emul) = {
 	.id		= UCLASS_PCI_EMUL,
 	.of_match	= sandbox_swap_case_ids,
 	.ops		= &sandbox_swap_case_emul_ops,
-	.priv_auto_alloc_size = sizeof(struct swap_case_priv),
-	.platdata_auto_alloc_size = sizeof(struct swap_case_platdata),
+	.priv_auto	= sizeof(struct swap_case_priv),
+	.platdata_auto	= sizeof(struct swap_case_platdata),
 };
 
 static struct pci_device_id sandbox_swap_case_supported[] = {
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 18da138507c..f2366d6592d 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -257,5 +257,5 @@  U_BOOT_DRIVER(tegra186_bpmp) = {
 	.probe		= tegra186_bpmp_probe,
 	.remove		= tegra186_bpmp_remove,
 	.ops		= &tegra186_bpmp_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra186_bpmp),
+	.priv_auto	= sizeof(struct tegra186_bpmp),
 };
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 82abf484e4f..926fba68638 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -494,6 +494,6 @@  U_BOOT_DRIVER(am654_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= am654_sdhci_bind,
 	.probe		= am654_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct am654_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct am654_sdhci_plat),
 };
diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
index 846622892a9..6c118b48190 100644
--- a/drivers/mmc/arm_pl180_mmci.c
+++ b/drivers/mmc/arm_pl180_mmci.c
@@ -551,7 +551,7 @@  U_BOOT_DRIVER(arm_pl180_mmc) = {
 	.probe = arm_pl180_mmc_probe,
 	.ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata,
 	.bind = arm_pl180_mmc_bind,
-	.priv_auto_alloc_size = sizeof(struct pl180_mmc_host),
-	.platdata_auto_alloc_size = sizeof(struct arm_pl180_mmc_plat),
+	.priv_auto	= sizeof(struct pl180_mmc_host),
+	.platdata_auto	= sizeof(struct arm_pl180_mmc_plat),
 };
 #endif
diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c
index 543c65a8e35..4bf02c3bb47 100644
--- a/drivers/mmc/aspeed_sdhci.c
+++ b/drivers/mmc/aspeed_sdhci.c
@@ -86,6 +86,6 @@  U_BOOT_DRIVER(aspeed_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= aspeed_sdhci_bind,
 	.probe		= aspeed_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct aspeed_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct aspeed_sdhci_plat),
 };
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index f56ae63bc2c..6f3b21b98d2 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -130,7 +130,7 @@  U_BOOT_DRIVER(atmel_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= atmel_sdhci_bind,
 	.probe		= atmel_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct atmel_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct atmel_sdhci_plat),
 };
 #endif
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 7a410d1dd36..7beb3b562cf 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -250,7 +250,7 @@  U_BOOT_DRIVER(sdhci_cdns) = {
 	.of_match = bcm2835_sdhci_match,
 	.bind = bcm2835_sdhci_bind,
 	.probe = bcm2835_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm2835_sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct bcm2835_sdhci_plat),
+	.priv_auto	= sizeof(struct bcm2835_sdhci_host),
+	.platdata_auto	= sizeof(struct bcm2835_sdhci_plat),
 	.ops = &sdhci_ops,
 };
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index ea8b385d7e1..06bebc27d3b 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -806,7 +806,7 @@  U_BOOT_DRIVER(bcm2835_sdhost) = {
 	.of_match = bcm2835_match,
 	.bind = bcm2835_bind,
 	.probe = bcm2835_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm2835_host),
-	.platdata_auto_alloc_size = sizeof(struct bcm2835_plat),
+	.priv_auto	= sizeof(struct bcm2835_host),
+	.platdata_auto	= sizeof(struct bcm2835_plat),
 	.ops = &bcm2835_ops,
 };
diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c
index 5269aa77ceb..a92467f8004 100644
--- a/drivers/mmc/bcmstb_sdhci.c
+++ b/drivers/mmc/bcmstb_sdhci.c
@@ -100,6 +100,6 @@  U_BOOT_DRIVER(sdhci_bcmstb) = {
 	.ops = &sdhci_ops,
 	.bind = sdhci_bcmstb_bind,
 	.probe = sdhci_bcmstb_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sdhci_bcmstb_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sdhci_bcmstb_plat),
 };
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 198c41f451f..98d7f6b0b53 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -166,6 +166,6 @@  U_BOOT_DRIVER(ca_dwmmc_drv) = {
 	.bind		= ca_dwmmc_bind,
 	.ops		= &ca_dwmci_dm_ops,
 	.probe		= ca_dwmmc_probe,
-	.priv_auto_alloc_size	= sizeof(struct ca_dwmmc_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct ca_mmc_plat),
+	.priv_auto	= sizeof(struct ca_dwmmc_priv_data),
+	.platdata_auto	= sizeof(struct ca_mmc_plat),
 };
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 0a05fb13bc9..0b9669abbc8 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -527,7 +527,7 @@  U_BOOT_DRIVER(ti_da830_mmc) = {
 	.id		= UCLASS_MMC,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match	= davinci_mmc_ids,
-	.platdata_auto_alloc_size = sizeof(struct davinci_mmc_plat),
+	.platdata_auto	= sizeof(struct davinci_mmc_plat),
 	.ofdata_to_platdata = davinci_mmc_ofdata_to_platdata,
 #endif
 #if CONFIG_BLK
@@ -535,7 +535,7 @@  U_BOOT_DRIVER(ti_da830_mmc) = {
 #endif
 	.probe = davinci_mmc_probe,
 	.ops = &davinci_mmc_ops,
-	.priv_auto_alloc_size = sizeof(struct davinci_mmc_priv),
+	.priv_auto	= sizeof(struct davinci_mmc_priv),
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 435ccac5942..63d00a3141f 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -306,7 +306,7 @@  U_BOOT_DRIVER(exynos_dwmmc_drv) = {
 	.bind		= exynos_dwmmc_bind,
 	.ops		= &dm_dwmci_ops,
 	.probe		= exynos_dwmmc_probe,
-	.priv_auto_alloc_size	= sizeof(struct dwmci_exynos_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct exynos_mmc_plat),
+	.priv_auto	= sizeof(struct dwmci_exynos_priv_data),
+	.platdata_auto	= sizeof(struct exynos_mmc_plat),
 };
 #endif
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 642784e1f35..b259c1a0320 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1114,7 +1114,7 @@  U_BOOT_DRIVER(fsl_esdhc) = {
 	.ops	= &fsl_esdhc_ops,
 	.bind	= fsl_esdhc_bind,
 	.probe	= fsl_esdhc_probe,
-	.platdata_auto_alloc_size = sizeof(struct fsl_esdhc_plat),
-	.priv_auto_alloc_size = sizeof(struct fsl_esdhc_priv),
+	.platdata_auto	= sizeof(struct fsl_esdhc_plat),
+	.priv_auto	= sizeof(struct fsl_esdhc_priv),
 };
 #endif
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 2d4a817a264..c174df6ed29 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -1707,8 +1707,8 @@  U_BOOT_DRIVER(fsl_esdhc) = {
 	.bind	= fsl_esdhc_bind,
 #endif
 	.probe	= fsl_esdhc_probe,
-	.platdata_auto_alloc_size = sizeof(struct fsl_esdhc_plat),
-	.priv_auto_alloc_size = sizeof(struct fsl_esdhc_priv),
+	.platdata_auto	= sizeof(struct fsl_esdhc_plat),
+	.priv_auto	= sizeof(struct fsl_esdhc_priv),
 };
 
 U_BOOT_DRIVER_ALIAS(fsl_esdhc, fsl_imx6q_usdhc)
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index bc0d5ffed51..5d312df2b48 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -477,6 +477,6 @@  U_BOOT_DRIVER(ftsdc010_mmc) = {
 	.ops		= &dm_ftsdc010_mmc_ops,
 	.bind		= ftsdc010_mmc_bind,
 	.probe		= ftsdc010_mmc_probe,
-	.priv_auto_alloc_size = sizeof(struct ftsdc_priv),
-	.platdata_auto_alloc_size = sizeof(struct ftsdc010_plat),
+	.priv_auto	= sizeof(struct ftsdc_priv),
+	.platdata_auto	= sizeof(struct ftsdc010_plat),
 };
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 0a347b2fb20..c135ee9b7ca 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -624,8 +624,8 @@  U_BOOT_DRIVER(atmel_mci) = {
 	.of_match = atmel_mci_ids,
 	.bind = atmel_mci_bind,
 	.probe = atmel_mci_probe,
-	.platdata_auto_alloc_size = sizeof(struct atmel_mci_plat),
-	.priv_auto_alloc_size = sizeof(struct atmel_mci_priv),
+	.platdata_auto	= sizeof(struct atmel_mci_plat),
+	.priv_auto	= sizeof(struct atmel_mci_priv),
 	.ops = &atmel_mci_mmc_ops,
 };
 #endif
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 67d6a05b3b5..cdc9a44e3e6 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -112,6 +112,6 @@  U_BOOT_DRIVER(hi6220_dwmmc_drv) = {
 	.ops = &dm_dwmci_ops,
 	.bind = hi6220_dwmmc_bind,
 	.probe = hi6220_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct hi6220_dwmmc_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct hi6220_dwmmc_plat),
+	.priv_auto	= sizeof(struct hi6220_dwmmc_priv_data),
+	.platdata_auto	= sizeof(struct hi6220_dwmmc_plat),
 };
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 9f530638e31..e5c453e2159 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -247,6 +247,6 @@  U_BOOT_DRIVER(iproc_sdhci_drv) = {
 	.ops = &sdhci_ops,
 	.bind = iproc_sdhci_bind,
 	.probe = iproc_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct iproc_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct iproc_sdhci_plat),
 };
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index b33f0850738..e3a28234463 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -501,8 +501,8 @@  U_BOOT_DRIVER(jz_mmc_drv) = {
 	.ofdata_to_platdata	= jz_mmc_ofdata_to_platdata,
 	.bind			= jz_mmc_bind,
 	.probe			= jz_mmc_probe,
-	.priv_auto_alloc_size	= sizeof(struct jz_mmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct jz_mmc_plat),
+	.priv_auto	= sizeof(struct jz_mmc_priv),
+	.platdata_auto	= sizeof(struct jz_mmc_plat),
 	.ops			= &jz_msc_ops,
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index a5e9ac5637b..a03a37783da 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -340,7 +340,7 @@  U_BOOT_DRIVER(meson_mmc) = {
 	.probe = meson_mmc_probe,
 	.bind = meson_mmc_bind,
 	.ofdata_to_platdata = meson_mmc_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct meson_mmc_platdata),
+	.platdata_auto	= sizeof(struct meson_mmc_platdata),
 };
 
 #ifdef CONFIG_PWRSEQ
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 285ac480615..269f31afeee 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -508,5 +508,5 @@  UCLASS_DRIVER(mmc) = {
 	.id		= UCLASS_MMC,
 	.name		= "mmc",
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
-	.per_device_auto_alloc_size = sizeof(struct mmc_uclass_priv),
+	.per_device_auto	= sizeof(struct mmc_uclass_priv),
 };
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 50fcd32674f..31c8f06ca65 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -468,6 +468,6 @@  U_BOOT_DRIVER(mmc_spi) = {
 	.ops = &mmc_spi_ops,
 	.probe = mmc_spi_probe,
 	.bind = mmc_spi_bind,
-	.platdata_auto_alloc_size = sizeof(struct mmc_spi_plat),
-	.priv_auto_alloc_size = sizeof(struct mmc_spi_priv),
+	.platdata_auto	= sizeof(struct mmc_spi_plat),
+	.priv_auto	= sizeof(struct mmc_spi_priv),
 };
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 2a1f412278e..049dd33ce4f 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -208,6 +208,6 @@  U_BOOT_DRIVER(msm_sdc_drv) = {
 	.bind		= msm_sdc_bind,
 	.probe		= msm_sdc_probe,
 	.remove		= msm_sdc_remove,
-	.priv_auto_alloc_size = sizeof(struct msm_sdhc),
-	.platdata_auto_alloc_size = sizeof(struct msm_sdhc_plat),
+	.priv_auto	= sizeof(struct msm_sdhc),
+	.platdata_auto	= sizeof(struct msm_sdhc_plat),
 };
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 4f9fa7d0ec3..d701a4cd008 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -1692,6 +1692,6 @@  U_BOOT_DRIVER(mtk_sd_drv) = {
 	.bind = msdc_drv_bind,
 	.probe = msdc_drv_probe,
 	.ops = &msdc_ops,
-	.platdata_auto_alloc_size = sizeof(struct msdc_plat),
-	.priv_auto_alloc_size = sizeof(struct msdc_host),
+	.platdata_auto	= sizeof(struct msdc_plat),
+	.priv_auto	= sizeof(struct msdc_host),
 };
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 9b3dfa13e61..fb803e3be7d 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -151,7 +151,7 @@  U_BOOT_DRIVER(mv_sdhci_drv) = {
 	.bind		= mv_sdhci_bind,
 	.probe		= mv_sdhci_probe,
 	.ops		= &sdhci_ops,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct mv_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct mv_sdhci_plat),
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 2b3a3a992cb..fd43f27ade5 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -718,8 +718,8 @@  U_BOOT_DRIVER(fsl_imx23_mmc) = {
 	.bind	= mxsmmc_bind,
 #endif
 	.probe	= mxsmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct mxsmmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct mxsmmc_platdata),
+	.priv_auto	= sizeof(struct mxsmmc_priv),
+	.platdata_auto	= sizeof(struct mxsmmc_platdata),
 };
 
 U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc)
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 04627594449..680459bae78 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -232,6 +232,6 @@  U_BOOT_DRIVER(nexell_dwmmc_drv) = {
 	.ops		= &dm_dwmci_ops,
 	.bind		= nexell_dwmmc_bind,
 	.probe		= nexell_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct nexell_dwmmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct nexell_mmc_plat),
+	.priv_auto	= sizeof(struct nexell_dwmmc_priv),
+	.platdata_auto	= sizeof(struct nexell_mmc_plat),
 };
diff --git a/drivers/mmc/octeontx_hsmmc.c b/drivers/mmc/octeontx_hsmmc.c
index a91aaf31461..5552342f8d9 100644
--- a/drivers/mmc/octeontx_hsmmc.c
+++ b/drivers/mmc/octeontx_hsmmc.c
@@ -3881,7 +3881,7 @@  U_BOOT_DRIVER(octeontx_hsmmc_host) = {
 	.id	= UCLASS_MISC,
 	.of_match = of_match_ptr(octeontx_hsmmc_host_ids),
 	.probe	= octeontx_mmc_host_probe,
-	.priv_auto_alloc_size = sizeof(struct octeontx_mmc_host),
+	.priv_auto	= sizeof(struct octeontx_mmc_host),
 	.child_pre_probe = octeontx_mmc_host_child_pre_probe,
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 715eee0e3e0..31003b3cb78 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -2029,14 +2029,14 @@  U_BOOT_DRIVER(omap_hsmmc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_hsmmc_ids,
 	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
+	.platdata_auto	= sizeof(struct omap_hsmmc_plat),
 #endif
 #ifdef CONFIG_BLK
 	.bind = omap_hsmmc_bind,
 #endif
 	.ops = &omap_hsmmc_ops,
 	.probe	= omap_hsmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
+	.priv_auto	= sizeof(struct omap_hsmmc_data),
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 0c45e1b8936..004b3cb7ea5 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -132,8 +132,8 @@  U_BOOT_DRIVER(pci_mmc) = {
 	.ofdata_to_platdata	= pci_mmc_ofdata_to_platdata,
 	.probe	= pci_mmc_probe,
 	.ops	= &sdhci_ops,
-	.priv_auto_alloc_size = sizeof(struct pci_mmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct pci_mmc_plat),
+	.priv_auto	= sizeof(struct pci_mmc_priv),
+	.platdata_auto	= sizeof(struct pci_mmc_plat),
 	ACPI_OPS_PTR(&pci_mmc_acpi_ops)
 };
 
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index e201bdb8f4e..dd10624dbfe 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -88,6 +88,6 @@  U_BOOT_DRIVER(pic32_sdhci_drv) = {
 	.ops			= &sdhci_ops,
 	.bind			= pic32_sdhci_bind,
 	.probe			= pic32_sdhci_probe,
-	.priv_auto_alloc_size	= sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct pic32_sdhci_plat)
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct pic32_sdhci_plat)
 };
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 2c081fdc69f..8be9ed6b550 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -530,7 +530,7 @@  U_BOOT_DRIVER(pxa_mmc) = {
 	.id	= UCLASS_MMC,
 	.name	= "pxa_mmc",
 	.ops	= &pxa_mmc_ops,
-	.priv_auto_alloc_size = sizeof(struct pxa_mmc_priv),
+	.priv_auto	= sizeof(struct pxa_mmc_priv),
 	.probe	= pxa_mmc_probe,
 };
 #endif /* !CONFIG_IS_ENABLED(DM_MMC) */
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index d80b3fc28f3..211e6904639 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -1014,7 +1014,7 @@  U_BOOT_DRIVER(renesas_sdhi) = {
 	.of_match = renesas_sdhi_match,
 	.bind = tmio_sd_bind,
 	.probe = renesas_sdhi_probe,
-	.priv_auto_alloc_size = sizeof(struct tmio_sd_priv),
-	.platdata_auto_alloc_size = sizeof(struct tmio_sd_plat),
+	.priv_auto	= sizeof(struct tmio_sd_priv),
+	.platdata_auto	= sizeof(struct tmio_sd_plat),
 	.ops = &renesas_sdhi_ops,
 };
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index f1dafa6ce71..e4c5288876f 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -176,8 +176,8 @@  U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = {
 	.ops		= &dm_dwmci_ops,
 	.bind		= rockchip_dwmmc_bind,
 	.probe		= rockchip_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct rockchip_dwmmc_priv),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_mmc_plat),
+	.priv_auto	= sizeof(struct rockchip_dwmmc_priv),
+	.platdata_auto	= sizeof(struct rockchip_mmc_plat),
 };
 
 U_BOOT_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc)
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index b073f1a08d4..131c976eaf6 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -114,6 +114,6 @@  U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= rockchip_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct rockchip_sdhc),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_sdhc_plat),
+	.priv_auto	= sizeof(struct rockchip_sdhc),
+	.platdata_auto	= sizeof(struct rockchip_sdhc_plat),
 };
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 24f599e868a..6841be6a145 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -246,7 +246,7 @@  U_BOOT_DRIVER(s5p_sdhci_drv) = {
 	.bind		= s5p_sdhci_bind,
 	.ops		= &sdhci_ops,
 	.probe		= s5p_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct s5p_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct s5p_sdhci_plat),
 };
 #endif /* CONFIG_DM_MMC */
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index e86ea8fe096..ece0e2d31cb 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -148,5 +148,5 @@  U_BOOT_DRIVER(mmc_sandbox) = {
 	.bind		= sandbox_mmc_bind,
 	.unbind		= sandbox_mmc_unbind,
 	.probe		= sandbox_mmc_probe,
-	.platdata_auto_alloc_size = sizeof(struct sandbox_mmc_plat),
+	.platdata_auto	= sizeof(struct sandbox_mmc_plat),
 };
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index cc99bebc305..efc09b91998 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -309,7 +309,7 @@  U_BOOT_DRIVER(sdhci_cdns) = {
 	.of_match = sdhci_cdns_match,
 	.bind = sdhci_cdns_bind,
 	.probe = sdhci_cdns_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sdhci_cdns_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sdhci_cdns_plat),
 	.ops = &sdhci_cdns_mmc_ops,
 };
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index ad386909e90..f3d10ac8be6 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -743,8 +743,8 @@  U_BOOT_DRIVER(sh_mmcif_mmc) = {
 	.of_match		= sh_mmcif_sd_match,
 	.bind			= sh_mmcif_dm_bind,
 	.probe			= sh_mmcif_dm_probe,
-	.priv_auto_alloc_size	= sizeof(struct sh_mmcif_host),
-	.platdata_auto_alloc_size = sizeof(struct sh_mmcif_plat),
+	.priv_auto	= sizeof(struct sh_mmcif_host),
+	.platdata_auto	= sizeof(struct sh_mmcif_plat),
 	.ops			= &sh_mmcif_dm_ops,
 };
 #endif
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 29f83b65542..04ce521a515 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -902,8 +902,8 @@  U_BOOT_DRIVER(sh_sdhi_mmc) = {
 	.of_match		= sh_sdhi_sd_match,
 	.bind			= sh_sdhi_dm_bind,
 	.probe			= sh_sdhi_dm_probe,
-	.priv_auto_alloc_size	= sizeof(struct sh_sdhi_host),
-	.platdata_auto_alloc_size = sizeof(struct sh_sdhi_plat),
+	.priv_auto	= sizeof(struct sh_sdhi_host),
+	.platdata_auto	= sizeof(struct sh_sdhi_plat),
 	.ops			= &sh_sdhi_dm_ops,
 };
 #endif
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index 4b468a1f3db..009933de5ef 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -195,6 +195,6 @@  U_BOOT_DRIVER(snps_dwmmc_drv) = {
 	.ops				= &snps_dwmci_dm_ops,
 	.bind				= snps_dwmmc_bind,
 	.probe				= snps_dwmmc_probe,
-	.priv_auto_alloc_size		= sizeof(struct snps_dwmci_priv_data),
-	.platdata_auto_alloc_size	= sizeof(struct snps_dwmci_plat),
+	.priv_auto		= sizeof(struct snps_dwmci_priv_data),
+	.platdata_auto	= sizeof(struct snps_dwmci_plat),
 };
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 0022f943bd7..80c4d6ed4d4 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -189,6 +189,6 @@  U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
 	.ops		= &dm_dwmci_ops,
 	.bind		= socfpga_dwmmc_bind,
 	.probe		= socfpga_dwmmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dwmci_socfpga_priv_data),
-	.platdata_auto_alloc_size = sizeof(struct socfpga_dwmci_plat),
+	.priv_auto	= sizeof(struct dwmci_socfpga_priv_data),
+	.platdata_auto	= sizeof(struct socfpga_dwmci_plat),
 };
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 5578feebef7..49ddabcbe5e 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -144,6 +144,6 @@  U_BOOT_DRIVER(sti_mmc) = {
 	.ops = &sdhci_ops,
 	.ofdata_to_platdata = sti_sdhci_ofdata_to_platdata,
 	.probe = sti_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sti_sdhci_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sti_sdhci_plat),
 };
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 77871d5afc9..80eecb60e8e 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -717,6 +717,6 @@  U_BOOT_DRIVER(stm32_sdmmc2) = {
 	.ops = &stm32_sdmmc2_ops,
 	.probe = stm32_sdmmc2_probe,
 	.bind = stm32_sdmmc_bind,
-	.priv_auto_alloc_size = sizeof(struct stm32_sdmmc2_priv),
-	.platdata_auto_alloc_size = sizeof(struct stm32_sdmmc2_plat),
+	.priv_auto	= sizeof(struct stm32_sdmmc2_priv),
+	.platdata_auto	= sizeof(struct stm32_sdmmc2_plat),
 };
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 0e03b07ce55..12e8c99076b 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -746,7 +746,7 @@  U_BOOT_DRIVER(sunxi_mmc_drv) = {
 	.bind		= sunxi_mmc_bind,
 	.probe		= sunxi_mmc_probe,
 	.ops		= &sunxi_mmc_ops,
-	.platdata_auto_alloc_size = sizeof(struct sunxi_mmc_plat),
-	.priv_auto_alloc_size = sizeof(struct sunxi_mmc_priv),
+	.platdata_auto	= sizeof(struct sunxi_mmc_plat),
+	.priv_auto	= sizeof(struct sunxi_mmc_priv),
 };
 #endif
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 879e2c98a21..46e185e3172 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -76,6 +76,6 @@  U_BOOT_DRIVER(sdhci_tangier) = {
 	.bind		= sdhci_tangier_bind,
 	.probe		= sdhci_tangier_probe,
 	.ops		= &sdhci_ops,
-	.priv_auto_alloc_size = sizeof(struct sdhci_host),
-	.platdata_auto_alloc_size = sizeof(struct sdhci_tangier_plat),
+	.priv_auto	= sizeof(struct sdhci_host),
+	.platdata_auto	= sizeof(struct sdhci_tangier_plat),
 };
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index cc78a2f2f08..f915c78f5d4 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -771,6 +771,6 @@  U_BOOT_DRIVER(tegra_mmc_drv) = {
 	.bind		= tegra_mmc_bind,
 	.probe		= tegra_mmc_probe,
 	.ops		= &tegra_mmc_ops,
-	.platdata_auto_alloc_size = sizeof(struct tegra_mmc_plat),
-	.priv_auto_alloc_size = sizeof(struct tegra_mmc_priv),
+	.platdata_auto	= sizeof(struct tegra_mmc_plat),
+	.priv_auto	= sizeof(struct tegra_mmc_priv),
 };
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 4dbe71fa2e1..ca674272fc0 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -84,7 +84,7 @@  U_BOOT_DRIVER(uniphier_mmc) = {
 	.of_match = uniphier_sd_match,
 	.bind = tmio_sd_bind,
 	.probe = uniphier_sd_probe,
-	.priv_auto_alloc_size = sizeof(struct tmio_sd_priv),
-	.platdata_auto_alloc_size = sizeof(struct tmio_sd_plat),
+	.priv_auto	= sizeof(struct tmio_sd_priv),
+	.platdata_auto	= sizeof(struct tmio_sd_plat),
 	.ops = &uniphier_sd_ops,
 };
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 6ce9d00d0ae..c0897258199 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -564,6 +564,6 @@  U_BOOT_DRIVER(xenon_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= xenon_sdhci_bind,
 	.probe		= xenon_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct xenon_sdhci_priv),
-	.platdata_auto_alloc_size = sizeof(struct xenon_sdhci_plat),
+	.priv_auto	= sizeof(struct xenon_sdhci_priv),
+	.platdata_auto	= sizeof(struct xenon_sdhci_plat),
 };
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 147ecc0d708..2ef63976e96 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -659,6 +659,6 @@  U_BOOT_DRIVER(arasan_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= arasan_sdhci_bind,
 	.probe		= arasan_sdhci_probe,
-	.priv_auto_alloc_size = sizeof(struct arasan_sdhci_priv),
-	.platdata_auto_alloc_size = sizeof(struct arasan_sdhci_plat),
+	.priv_auto	= sizeof(struct arasan_sdhci_priv),
+	.platdata_auto	= sizeof(struct arasan_sdhci_plat),
 };
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index cd4d32959a0..b50d3061741 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -401,6 +401,6 @@  U_BOOT_DRIVER(altera_qspi) = {
 	.id	= UCLASS_MTD,
 	.of_match = altera_qspi_ids,
 	.ofdata_to_platdata = altera_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata),
+	.platdata_auto	= sizeof(struct altera_qspi_platdata),
 	.probe	= altera_qspi_probe,
 };
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 846b0e832b7..c86e504da30 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -102,5 +102,5 @@  U_BOOT_DRIVER(hbmc_am654) = {
 	.of_match = am654_hbmc_dt_ids,
 	.probe = am654_hbmc_probe,
 	.bind = am654_hbmc_bind,
-	.priv_auto_alloc_size = sizeof(struct am654_hbmc_priv),
+	.priv_auto	= sizeof(struct am654_hbmc_priv),
 };
diff --git a/drivers/mtd/mtd-uclass.c b/drivers/mtd/mtd-uclass.c
index 54182174319..9f5f672ba3f 100644
--- a/drivers/mtd/mtd-uclass.c
+++ b/drivers/mtd/mtd-uclass.c
@@ -32,5 +32,5 @@  int mtd_probe(struct udevice *dev)
 UCLASS_DRIVER(mtd) = {
 	.id		= UCLASS_MTD,
 	.name		= "mtd",
-	.per_device_auto_alloc_size = sizeof(struct mtd_info),
+	.per_device_auto	= sizeof(struct mtd_info),
 };
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 0615e503780..d4e8f8df87d 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -1310,7 +1310,7 @@  U_BOOT_DRIVER(arasan_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = arasan_nand_dt_ids,
 	.probe = arasan_probe,
-	.priv_auto_alloc_size = sizeof(struct arasan_nand_info),
+	.priv_auto	= sizeof(struct arasan_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index 6313403cd65..71682cb6e79 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -109,7 +109,7 @@  U_BOOT_DRIVER(bcm63158_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = bcm63158_nand_dt_ids,
 	.probe = bcm63158_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm63158_nand_soc),
+	.priv_auto	= sizeof(struct bcm63158_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index cd4b24a51a1..f424194ecca 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -102,7 +102,7 @@  U_BOOT_DRIVER(bcm6368_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = bcm6368_nand_dt_ids,
 	.probe = bcm6368_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6368_nand_soc),
+	.priv_auto	= sizeof(struct bcm6368_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index aa042bef158..47ddde4f9b0 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -108,7 +108,7 @@  U_BOOT_DRIVER(bcm68360_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = bcm68360_nand_dt_ids,
 	.probe = bcm68360_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm68360_nand_soc),
+	.priv_auto	= sizeof(struct bcm68360_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 07884550906..646495096c2 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -108,7 +108,7 @@  U_BOOT_DRIVER(bcm6838_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = bcm6838_nand_dt_ids,
 	.probe = bcm6838_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6838_nand_soc),
+	.priv_auto	= sizeof(struct bcm6838_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index 818eae8a7c6..7573cd944ff 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -109,7 +109,7 @@  U_BOOT_DRIVER(bcm6858_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = bcm6858_nand_dt_ids,
 	.probe = bcm6858_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6858_nand_soc),
+	.priv_auto	= sizeof(struct bcm6858_nand_soc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 4416b8fa1e6..4645cc16997 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -816,7 +816,7 @@  U_BOOT_DRIVER(davinci_nand) = {
 	.id		= UCLASS_MTD,
 	.of_match	= davinci_nand_ids,
 	.probe		= davinci_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct nand_chip),
+	.priv_auto	= sizeof(struct nand_chip),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 8318ff507f3..140ef7f725e 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -172,7 +172,7 @@  U_BOOT_DRIVER(denali_nand_dt) = {
 	.id = UCLASS_MTD,
 	.of_match = denali_nand_dt_ids,
 	.probe = denali_dt_probe,
-	.priv_auto_alloc_size = sizeof(struct denali_nand_info),
+	.priv_auto	= sizeof(struct denali_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c
index 43dbe9e66ec..78a423dbbf4 100644
--- a/drivers/mtd/nand/raw/mxs_nand_dt.c
+++ b/drivers/mtd/nand/raw/mxs_nand_dt.c
@@ -168,7 +168,7 @@  U_BOOT_DRIVER(mxs_nand_dt) = {
 	.id = UCLASS_MTD,
 	.of_match = mxs_nand_dt_ids,
 	.probe = mxs_nand_dt_probe,
-	.priv_auto_alloc_size = sizeof(struct mxs_nand_info),
+	.priv_auto	= sizeof(struct mxs_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/octeontx_bch.c b/drivers/mtd/nand/raw/octeontx_bch.c
index 693706257c9..a41772880f9 100644
--- a/drivers/mtd/nand/raw/octeontx_bch.c
+++ b/drivers/mtd/nand/raw/octeontx_bch.c
@@ -410,7 +410,7 @@  U_BOOT_DRIVER(octeontx_pci_bchpf) = {
 	.id	= UCLASS_MISC,
 	.probe	= octeontx_pci_bchpf_probe,
 	.remove = octeontx_pci_bchpf_remove,
-	.priv_auto_alloc_size = sizeof(struct bch_device),
+	.priv_auto	= sizeof(struct bch_device),
 	.flags = DM_FLAG_OS_PREPARE,
 };
 
@@ -418,7 +418,7 @@  U_BOOT_DRIVER(octeontx_pci_bchvf) = {
 	.name	= BCHVF_DRIVER_NAME,
 	.id	= UCLASS_MISC,
 	.probe = octeontx_pci_bchvf_probe,
-	.priv_auto_alloc_size = sizeof(struct bch_vf),
+	.priv_auto	= sizeof(struct bch_vf),
 };
 
 U_BOOT_PCI_DEVICE(octeontx_pci_bchpf, octeontx_bchpf_pci_id_table);
diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c
index ad219171e9c..cfeca1e6880 100644
--- a/drivers/mtd/nand/raw/octeontx_nand.c
+++ b/drivers/mtd/nand/raw/octeontx_nand.c
@@ -2219,7 +2219,7 @@  U_BOOT_DRIVER(octeontx_pci_nand) = {
 	.of_match = of_match_ptr(octeontx_nand_ids),
 	.ofdata_to_platdata = octeontx_nand_ofdata_to_platdata,
 	.probe = octeontx_pci_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct octeontx_nfc),
+	.priv_auto	= sizeof(struct octeontx_nfc),
 	.remove = octeontx_pci_nand_disable,
 	.flags = DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 361a9e32935..e923ce363a0 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -1937,7 +1937,7 @@  U_BOOT_DRIVER(pxa3xx_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = pxa3xx_nand_dt_ids,
 	.probe = pxa3xx_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct pxa3xx_nand_info) +
+	.priv_auto	= sizeof(struct pxa3xx_nand_info) +
 		sizeof(struct pxa3xx_nand_host) * CONFIG_SYS_MAX_NAND_DEVICE,
 };
 
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 47fe61090da..8fe7ec1343e 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -1033,7 +1033,7 @@  U_BOOT_DRIVER(stm32_fmc2_nfc) = {
 	.id = UCLASS_MTD,
 	.of_match = stm32_fmc2_nfc_match,
 	.probe = stm32_fmc2_nfc_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_fmc2_nfc),
+	.priv_auto	= sizeof(struct stm32_fmc2_nfc),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index b9f5bdd9535..797fc230504 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -990,7 +990,7 @@  U_BOOT_DRIVER(tegra_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = tegra_nand_dt_ids,
 	.probe = tegra_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra_nand_info),
+	.priv_auto	= sizeof(struct tegra_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 4e6fdc607ff..422b9c57a88 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -784,7 +784,7 @@  U_BOOT_DRIVER(vf610_nfc_dt) = {
 	.name = "vf610-nfc-dt",
 	.id = UCLASS_MTD,
 	.of_match = vf610_nfc_dt_ids,
-	.priv_auto_alloc_size = sizeof(struct vf610_nfc),
+	.priv_auto	= sizeof(struct vf610_nfc),
 	.probe = vf610_nfc_dt_probe,
 };
 
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 92db2aa19c8..7cf0ccb656c 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1286,7 +1286,7 @@  U_BOOT_DRIVER(zynq_nand) = {
 	.id = UCLASS_MTD,
 	.of_match = zynq_nand_dt_ids,
 	.probe = zynq_nand_probe,
-	.priv_auto_alloc_size = sizeof(struct zynq_nand_info),
+	.priv_auto	= sizeof(struct zynq_nand_info),
 };
 
 void board_nand_init(void)
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 8c7e07d4630..fc9d4edbe04 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -1255,6 +1255,6 @@  U_BOOT_DRIVER(spinand) = {
 	.name = "spi_nand",
 	.id = UCLASS_MTD,
 	.of_match = spinand_ids,
-	.priv_auto_alloc_size = sizeof(struct spinand_device),
+	.priv_auto	= sizeof(struct spinand_device),
 	.probe = spinand_probe,
 };
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 1a362616694..8ac8183b906 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -600,7 +600,7 @@  U_BOOT_DRIVER(sandbox_sf_emul) = {
 	.ofdata_to_platdata = sandbox_sf_ofdata_to_platdata,
 	.probe		= sandbox_sf_probe,
 	.remove		= sandbox_sf_remove,
-	.priv_auto_alloc_size = sizeof(struct sandbox_spi_flash),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_spi_flash_plat_data),
+	.priv_auto	= sizeof(struct sandbox_spi_flash),
+	.platdata_auto	= sizeof(struct sandbox_spi_flash_plat_data),
 	.ops		= &sandbox_sf_emul_ops,
 };
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 09c11439b08..ed629f1d458 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -100,5 +100,5 @@  UCLASS_DRIVER(spi_flash) = {
 	.id		= UCLASS_SPI_FLASH,
 	.name		= "spi_flash",
 	.post_bind	= spi_flash_post_bind,
-	.per_device_auto_alloc_size = sizeof(struct spi_flash),
+	.per_device_auto	= sizeof(struct spi_flash),
 };
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 27d847d4218..b59edd152cc 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -693,6 +693,6 @@  U_BOOT_DRIVER(spi_dataflash) = {
 	.id		= UCLASS_SPI_FLASH,
 	.of_match	= spi_dataflash_ids,
 	.probe		= spi_dataflash_probe,
-	.priv_auto_alloc_size = sizeof(struct dataflash),
+	.priv_auto	= sizeof(struct dataflash),
 	.ops		= &spi_dataflash_ops,
 };
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index b959e3453a5..c8bcec3c589 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -166,7 +166,7 @@  U_BOOT_DRIVER(jedec_spi_nor) = {
 	.of_match	= spi_flash_std_ids,
 	.probe		= spi_flash_std_probe,
 	.remove		= spi_flash_std_remove,
-	.priv_auto_alloc_size = sizeof(struct spi_flash),
+	.priv_auto	= sizeof(struct spi_flash),
 	.ops		= &spi_flash_std_ops,
 };
 
diff --git a/drivers/mux/mux-uclass.c b/drivers/mux/mux-uclass.c
index a35c3d9c948..6d28dbe4d14 100644
--- a/drivers/mux/mux-uclass.c
+++ b/drivers/mux/mux-uclass.c
@@ -331,5 +331,5 @@  UCLASS_DRIVER(mux) = {
 	.id		= UCLASS_MUX,
 	.name		= "mux",
 	.post_probe	= mux_uclass_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct mux_chip),
+	.per_device_auto	= sizeof(struct mux_chip),
 };
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index ccba3947ac5..02565aae7be 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -1291,7 +1291,7 @@  U_BOOT_DRIVER(eth_ag7xxx) = {
 	.probe		= ag7xxx_eth_probe,
 	.remove		= ag7xxx_eth_remove,
 	.ops		= &ag7xxx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct ar7xxx_eth_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ar7xxx_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 93b26da3926..7d0c58cd532 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -711,7 +711,7 @@  U_BOOT_DRIVER(altera_tse) = {
 	.of_match = altera_tse_ids,
 	.ops	= &altera_tse_ops,
 	.ofdata_to_platdata = altera_tse_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
-	.priv_auto_alloc_size = sizeof(struct altera_tse_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct altera_tse_priv),
 	.probe	= altera_tse_probe,
 };
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 9ddc0f938f2..6d622466781 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -533,7 +533,7 @@  U_BOOT_DRIVER(bcm6348_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = bcm6348_eth_ids,
 	.ops = &bcm6348_eth_ops,
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
-	.priv_auto_alloc_size = sizeof(struct bcm6348_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct bcm6348_eth_priv),
 	.probe = bcm6348_eth_probe,
 };
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 38a2a30fe6c..b0bf0a939d7 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -637,7 +637,7 @@  U_BOOT_DRIVER(bcm6368_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = bcm6368_eth_ids,
 	.ops = &bcm6368_eth_ops,
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
-	.priv_auto_alloc_size = sizeof(struct bcm6368_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct bcm6368_eth_priv),
 	.probe = bcm6368_eth_probe,
 };
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index ace13313621..b6ebac220ed 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -732,7 +732,7 @@  U_BOOT_DRIVER(eth_bcmgenet) = {
 	.ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata,
 	.probe  = bcmgenet_eth_probe,
 	.ops    = &bcmgenet_gmac_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct bcmgenet_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 9f8c6c58d95..26d2ec09708 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -751,8 +751,8 @@  U_BOOT_DRIVER(eth_dc2114x) = {
 	.bind	= dc2114x_bind,
 	.probe	= dc2114x_probe,
 	.ops	= &dc2114x_ops,
-	.priv_auto_alloc_size = sizeof(struct dc2114x_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct dc2114x_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_dc2114x, supported);
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 4c19abbaf0c..32b3fc82302 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -873,8 +873,8 @@  U_BOOT_DRIVER(eth_designware) = {
 	.probe	= designware_eth_probe,
 	.remove	= designware_eth_remove,
 	.ops	= &designware_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct dw_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct dw_eth_pdata),
+	.priv_auto	= sizeof(struct dw_eth_dev),
+	.platdata_auto	= sizeof(struct dw_eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 74893f5e8b1..eb79da29d69 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -2193,6 +2193,6 @@  U_BOOT_DRIVER(eth_eqos) = {
 	.probe = eqos_probe,
 	.remove = eqos_remove,
 	.ops = &eqos_ops,
-	.priv_auto_alloc_size = sizeof(struct eqos_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct eqos_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index 9d3f3ac5d93..2edd7a74df5 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -61,7 +61,7 @@  U_BOOT_DRIVER(dwmac_s700) = {
 	.ofdata_to_platdata = dwmac_s700_ofdata_to_platdata,
 	.probe  = dwmac_s700_probe,
 	.ops    = &designware_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct dw_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct dw_eth_dev),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index e93561dffa8..9ab2eeb2bcd 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -118,7 +118,7 @@  U_BOOT_DRIVER(dwmac_socfpga) = {
 	.ofdata_to_platdata = dwmac_socfpga_ofdata_to_platdata,
 	.probe		= dwmac_socfpga_probe,
 	.ops		= &designware_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct dw_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct dwmac_socfpga_platdata),
+	.priv_auto	= sizeof(struct dw_eth_dev),
+	.platdata_auto	= sizeof(struct dwmac_socfpga_platdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 8e6c755f641..87acfa5daa7 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5940,8 +5940,8 @@  U_BOOT_DRIVER(eth_e1000) = {
 	.bind	= e1000_eth_bind,
 	.probe	= e1000_eth_probe,
 	.ops	= &e1000_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct e1000_hw),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct e1000_hw),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index feba5327da4..59582b91217 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -1009,8 +1009,8 @@  U_BOOT_DRIVER(eth_eepro100) = {
 	.bind	= eepro100_bind,
 	.probe	= eepro100_probe,
 	.ops	= &eepro100_ops,
-	.priv_auto_alloc_size = sizeof(struct eepro100_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct eepro100_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_eepro100, supported);
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index b383f455276..65615f13103 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -113,7 +113,7 @@  int eth_phy_get_addr(struct udevice *dev)
 UCLASS_DRIVER(eth_phy_generic) = {
 	.id		= UCLASS_ETH_PHY,
 	.name		= "eth_phy_generic",
-	.per_device_auto_alloc_size = sizeof(struct eth_phy_device_priv),
+	.per_device_auto	= sizeof(struct eth_phy_device_priv),
 };
 
 U_BOOT_DRIVER(eth_phy_generic_drv) = {
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b9d80a5b08a..cb232f68bcf 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -750,8 +750,8 @@  U_BOOT_DRIVER(ethoc) = {
 	.probe				= ethoc_probe,
 	.remove				= ethoc_remove,
 	.ops				= &ethoc_ops,
-	.priv_auto_alloc_size		= sizeof(struct ethoc),
-	.platdata_auto_alloc_size	= sizeof(struct ethoc_eth_pdata),
+	.priv_auto		= sizeof(struct ethoc),
+	.platdata_auto	= sizeof(struct ethoc_eth_pdata),
 };
 
 #else
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 4560dd80015..8bf585252d1 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1598,7 +1598,7 @@  U_BOOT_DRIVER(fecmxc_gem) = {
 	.probe	= fecmxc_probe,
 	.remove	= fecmxc_remove,
 	.ops	= &fecmxc_ops,
-	.priv_auto_alloc_size = sizeof(struct fec_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct fec_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 #endif
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 2f433cedd09..3a827a97a88 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -1130,8 +1130,8 @@  U_BOOT_DRIVER(eth_fman) = {
 	.probe = fm_eth_probe,
 	.remove = fm_eth_remove,
 	.ops = &fm_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct fm_eth),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct fm_eth),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index bbb1738c4bd..7d51be1f723 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -605,7 +605,7 @@  U_BOOT_DRIVER(fman) = {
 	.of_match = fman_ids,
 	.probe = fman_probe,
 	.remove = fman_remove,
-	.priv_auto_alloc_size = sizeof(struct fman_priv),
+	.priv_auto	= sizeof(struct fman_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index e15c28d5005..2e97f51c4c3 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -297,8 +297,8 @@  U_BOOT_DRIVER(fman_mdio) = {
 	.probe = fm_mdio_probe,
 	.remove = fm_mdio_remove,
 	.ops = &fm_mdio_ops,
-	.priv_auto_alloc_size = sizeof(struct fm_mdio_priv),
-	.platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv),
+	.priv_auto	= sizeof(struct fm_mdio_priv),
+	.platdata_auto	= sizeof(struct mdio_perdev_priv),
 };
 #endif /* CONFIG_PHYLIB && CONFIG_DM_MDIO */
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 2929ae72092..07ad44de470 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -677,8 +677,8 @@  U_BOOT_DRIVER(eth_enetc) = {
 	.probe	= enetc_probe,
 	.remove = enetc_remove,
 	.ops	= &enetc_ops,
-	.priv_auto_alloc_size = sizeof(struct enetc_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct enetc_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static struct pci_device_id enetc_ids[] = {
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 47257a6cf68..4da97b61d17 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -144,7 +144,7 @@  U_BOOT_DRIVER(enetc_mdio) = {
 	.bind	= enetc_mdio_bind,
 	.probe	= enetc_mdio_probe,
 	.ops	= &enetc_mdio_ops,
-	.priv_auto_alloc_size = sizeof(struct enetc_mdio_priv),
+	.priv_auto	= sizeof(struct enetc_mdio_priv),
 };
 
 static struct pci_device_id enetc_mdio_ids[] = {
diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c
index 6d8332d19ae..6d4e682fdfc 100644
--- a/drivers/net/fsl_ls_mdio.c
+++ b/drivers/net/fsl_ls_mdio.c
@@ -142,5 +142,5 @@  U_BOOT_DRIVER(fsl_ls_mdio) = {
 	.of_match = fsl_ls_mdio_of_ids,
 	.probe = fsl_ls_mdio_probe,
 	.ops = &fsl_ls_mdio_ops,
-	.priv_auto_alloc_size = sizeof(struct fsl_ls_mdio_priv),
+	.priv_auto	= sizeof(struct fsl_ls_mdio_priv),
 };
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 6eaa60ac187..1e71064adef 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -594,6 +594,6 @@  U_BOOT_DRIVER(mcffec) = {
 	.probe	= mcdmafec_probe,
 	.remove	= mcdmafec_remove,
 	.ops	= &mcdmafec_ops,
-	.priv_auto_alloc_size = sizeof(struct fec_info_dma),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct fec_info_dma),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 77f1a96a2eb..faeb292e55b 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -248,8 +248,8 @@  U_BOOT_DRIVER(tsec_mdio) = {
 	.probe = tsec_mdio_probe,
 	.remove = tsec_mdio_remove,
 	.ops = &tsec_mdio_ops,
-	.priv_auto_alloc_size = sizeof(struct tsec_mdio_priv),
-	.platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv),
+	.priv_auto	= sizeof(struct tsec_mdio_priv),
+	.platdata_auto	= sizeof(struct mdio_perdev_priv),
 };
 #endif /* CONFIG_PHYLIB */
 #endif /* CONFIG_DM_MDIO */
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 2ed012d5dd0..97c50cb18ac 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -613,7 +613,7 @@  U_BOOT_DRIVER(ftgmac100) = {
 	.probe	= ftgmac100_probe,
 	.remove = ftgmac100_remove,
 	.ops	= &ftgmac100_ops,
-	.priv_auto_alloc_size = sizeof(struct ftgmac100_data),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ftgmac100_data),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 292690de961..20b8e35516b 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -440,8 +440,8 @@  U_BOOT_DRIVER(ftmac100) = {
 	.ofdata_to_platdata = ftmac100_ofdata_to_platdata,
 	.probe	= ftmac100_probe,
 	.ops	= &ftmac100_ops,
-	.priv_auto_alloc_size = sizeof(struct ftmac100_data),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ftmac100_data),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 8d95ee15ffd..1b1e7a8f69d 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -759,7 +759,7 @@  U_BOOT_DRIVER(eth_gmac_rockchip) = {
 	.ofdata_to_platdata = gmac_rockchip_ofdata_to_platdata,
 	.probe	= gmac_rockchip_probe,
 	.ops	= &gmac_rockchip_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct dw_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct gmac_rockchip_platdata),
+	.priv_auto	= sizeof(struct dw_eth_dev),
+	.platdata_auto	= sizeof(struct gmac_rockchip_platdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 00c07770290..38f363cd496 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -598,6 +598,6 @@  U_BOOT_DRIVER(eth_higmac) = {
 	.probe	= higmac_probe,
 	.remove	= higmac_remove,
 	.ops	= &higmac_ops,
-	.priv_auto_alloc_size = sizeof(struct higmac_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct higmac_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 58e065cdcc2..6340d6317de 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -698,8 +698,8 @@  U_BOOT_DRIVER(ks8851) = {
 	.ofdata_to_platdata = ks8851_ofdata_to_platdata,
 	.probe		= ks8851_probe,
 	.ops		= &ks8851_ops,
-	.priv_auto_alloc_size = sizeof(struct ks_net),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ks_net),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 42eaf49d712..5932b457745 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -1191,8 +1191,8 @@  U_BOOT_DRIVER(ldpaa_eth) = {
 	.bind = ldpaa_eth_bind,
 	.probe = ldpaa_eth_probe,
 	.ops = &ldpaa_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct ldpaa_eth_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ldpaa_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 #else
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index b80a259ff75..2ec3039cf81 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1335,8 +1335,8 @@  U_BOOT_DRIVER(eth_macb) = {
 	.probe	= macb_eth_probe,
 	.remove	= macb_eth_remove,
 	.ops	= &macb_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct macb_device),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct macb_device),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 #endif
 
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 43b7dbb1a01..72c1827e579 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -614,6 +614,6 @@  U_BOOT_DRIVER(mcffec) = {
 	.probe	= mcffec_probe,
 	.remove	= mcffec_remove,
 	.ops	= &mcffec_ops,
-	.priv_auto_alloc_size = sizeof(struct fec_info_s),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct fec_info_s),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mdio-ipq4019.c b/drivers/net/mdio-ipq4019.c
index bc68e1d5065..13a8856286a 100644
--- a/drivers/net/mdio-ipq4019.c
+++ b/drivers/net/mdio-ipq4019.c
@@ -142,5 +142,5 @@  U_BOOT_DRIVER(ipq4019_mdio) = {
 	.bind           = ipq4019_mdio_bind,
 	.probe          = ipq4019_mdio_probe,
 	.ops            = &ipq4019_mdio_ops,
-	.priv_auto_alloc_size   = sizeof(struct ipq4019_mdio_priv),
+	.priv_auto	  = sizeof(struct ipq4019_mdio_priv),
 };
diff --git a/drivers/net/mdio_mux_i2creg.c b/drivers/net/mdio_mux_i2creg.c
index cc02b5ffd45..f8557dd2c49 100644
--- a/drivers/net/mdio_mux_i2creg.c
+++ b/drivers/net/mdio_mux_i2creg.c
@@ -105,5 +105,5 @@  U_BOOT_DRIVER(mdio_mux_i2creg) = {
 	.of_match	= mdio_mux_i2creg_ids,
 	.probe		= mdio_mux_i2creg_probe,
 	.ops		= &mdio_mux_i2creg_ops,
-	.priv_auto_alloc_size = sizeof(struct mdio_mux_i2creg_priv),
+	.priv_auto	= sizeof(struct mdio_mux_i2creg_priv),
 };
diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c
index 3dba4d18a15..fff6ddb2f14 100644
--- a/drivers/net/mdio_mux_sandbox.c
+++ b/drivers/net/mdio_mux_sandbox.c
@@ -93,5 +93,5 @@  U_BOOT_DRIVER(mdio_mux_sandbox) = {
 	.of_match	= mdio_mux_sandbox_ids,
 	.probe		= mdio_mux_sandbox_probe,
 	.ops		= &mdio_mux_sandbox_ops,
-	.priv_auto_alloc_size = sizeof(struct mdio_mux_sandbox_priv),
+	.priv_auto	= sizeof(struct mdio_mux_sandbox_priv),
 };
diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c
index b731f60a98a..2b50ffc3acc 100644
--- a/drivers/net/mdio_sandbox.c
+++ b/drivers/net/mdio_sandbox.c
@@ -90,5 +90,5 @@  U_BOOT_DRIVER(mdio_sandbox) = {
 	.of_match	= mdio_sandbox_ids,
 	.probe		= mdio_sandbox_probe,
 	.ops		= &mdio_sandbox_ops,
-	.priv_auto_alloc_size = sizeof(struct mdio_sandbox_priv),
+	.priv_auto	= sizeof(struct mdio_sandbox_priv),
 };
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 1c9a401de81..779377b0db8 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -964,6 +964,6 @@  U_BOOT_DRIVER(jr2) = {
 	.probe				= jr2_probe,
 	.remove				= jr2_remove,
 	.ops				= &jr2_ops,
-	.priv_auto_alloc_size		= sizeof(struct jr2_private),
-	.platdata_auto_alloc_size	= sizeof(struct eth_pdata),
+	.priv_auto		= sizeof(struct jr2_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 1d46d0e5e1e..8095f4fabdf 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -737,6 +737,6 @@  U_BOOT_DRIVER(luton) = {
 	.probe	  = luton_probe,
 	.remove	  = luton_remove,
 	.ops	  = &luton_ops,
-	.priv_auto_alloc_size = sizeof(struct luton_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct luton_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 2a48dc6a190..5179b82a637 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -651,6 +651,6 @@  U_BOOT_DRIVER(ocelot) = {
 	.probe	  = ocelot_probe,
 	.remove	  = ocelot_remove,
 	.ops	  = &ocelot_ops,
-	.priv_auto_alloc_size = sizeof(struct ocelot_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ocelot_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index d8ee1a76989..e70f44cc10f 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -604,6 +604,6 @@  U_BOOT_DRIVER(serval) = {
 	.probe				= serval_probe,
 	.remove				= serval_remove,
 	.ops				= &serval_ops,
-	.priv_auto_alloc_size		= sizeof(struct serval_private),
-	.platdata_auto_alloc_size	= sizeof(struct eth_pdata),
+	.priv_auto		= sizeof(struct serval_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index 1cf2273142b..88556409385 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -523,6 +523,6 @@  U_BOOT_DRIVER(servalt) = {
 	.probe				= servalt_probe,
 	.remove				= servalt_remove,
 	.ops				= &servalt_ops,
-	.priv_auto_alloc_size		= sizeof(struct servalt_private),
-	.platdata_auto_alloc_size	= sizeof(struct eth_pdata),
+	.priv_auto		= sizeof(struct servalt_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 64f1c8c828d..60532111aba 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -651,6 +651,6 @@  U_BOOT_DRIVER(mt7628_eth) = {
 	.of_match = mt7628_eth_ids,
 	.probe	= mt7628_eth_probe,
 	.ops	= &mt7628_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct mt7628_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct mt7628_eth_dev),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 5183c08e14c..05fdb44380c 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -1559,10 +1559,10 @@  U_BOOT_DRIVER(mtk_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = mtk_eth_ids,
 	.ofdata_to_platdata = mtk_eth_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.probe = mtk_eth_probe,
 	.remove = mtk_eth_remove,
 	.ops = &mtk_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct mtk_eth_priv),
+	.priv_auto	= sizeof(struct mtk_eth_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 2f9464b961a..0be67152ca8 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -1041,7 +1041,7 @@  U_BOOT_DRIVER(mvgbe) = {
 	.ofdata_to_platdata = mvgbe_ofdata_to_platdata,
 	.probe	= mvgbe_probe,
 	.ops	= &mvgbe_ops,
-	.priv_auto_alloc_size = sizeof(struct mvgbe_device),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct mvgbe_device),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index a8e93e80fc0..005f28f1b25 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -232,6 +232,6 @@  U_BOOT_DRIVER(mvmdio) = {
 	.bind			= mvmdio_bind,
 	.probe			= mvmdio_probe,
 	.ops			= &mvmdio_ops,
-	.priv_auto_alloc_size	= sizeof(struct mvmdio_priv),
+	.priv_auto	= sizeof(struct mvmdio_priv),
 };
 
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 83f99e5d8ab..a90a631757d 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -1830,6 +1830,6 @@  U_BOOT_DRIVER(mvneta) = {
 	.ofdata_to_platdata = mvneta_ofdata_to_platdata,
 	.probe	= mvneta_probe,
 	.ops	= &mvneta_ops,
-	.priv_auto_alloc_size = sizeof(struct mvneta_port),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct mvneta_port),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index c1a78a2918e..c353aa677d0 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -5424,8 +5424,8 @@  static struct driver mvpp2_driver = {
 	.probe	= mvpp2_probe,
 	.remove = mvpp2_remove,
 	.ops	= &mvpp2_ops,
-	.priv_auto_alloc_size = sizeof(struct mvpp2_port),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct mvpp2_port),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
 
@@ -5501,5 +5501,5 @@  U_BOOT_DRIVER(mvpp2_base) = {
 	.id	= UCLASS_MISC,
 	.of_match = mvpp2_ids,
 	.bind	= mvpp2_base_bind,
-	.priv_auto_alloc_size = sizeof(struct mvpp2),
+	.priv_auto	= sizeof(struct mvpp2),
 };
diff --git a/drivers/net/octeontx/bgx.c b/drivers/net/octeontx/bgx.c
index fbe2e2c073e..2ea54be84da 100644
--- a/drivers/net/octeontx/bgx.c
+++ b/drivers/net/octeontx/bgx.c
@@ -1552,7 +1552,7 @@  U_BOOT_DRIVER(octeontx_bgx) = {
 	.id	= UCLASS_MISC,
 	.probe	= octeontx_bgx_probe,
 	.remove	= octeontx_bgx_remove,
-	.priv_auto_alloc_size = sizeof(struct bgx),
+	.priv_auto	= sizeof(struct bgx),
 	.flags  = DM_FLAG_OS_PREPARE,
 };
 
diff --git a/drivers/net/octeontx/nic_main.c b/drivers/net/octeontx/nic_main.c
index 1a805f7a468..8f05d4e720e 100644
--- a/drivers/net/octeontx/nic_main.c
+++ b/drivers/net/octeontx/nic_main.c
@@ -766,7 +766,7 @@  U_BOOT_DRIVER(octeontx_nic) = {
 	.name	= "octeontx_nic",
 	.id	= UCLASS_MISC,
 	.probe	= octeontx_nic_probe,
-	.priv_auto_alloc_size = sizeof(struct nicpf),
+	.priv_auto	= sizeof(struct nicpf),
 };
 
 static struct pci_device_id octeontx_nic_supported[] = {
diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c
index 800df8a500b..2d65ff1b5c2 100644
--- a/drivers/net/octeontx/nicvf_main.c
+++ b/drivers/net/octeontx/nicvf_main.c
@@ -569,8 +569,8 @@  U_BOOT_DRIVER(octeontx_vnic) = {
 	.id	= UCLASS_ETH,
 	.probe	= octeontx_vnic_probe,
 	.ops	= &octeontx_vnic_ops,
-	.priv_auto_alloc_size = sizeof(struct nicvf),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct nicvf),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static struct pci_device_id octeontx_vnic_supported[] = {
diff --git a/drivers/net/octeontx2/cgx.c b/drivers/net/octeontx2/cgx.c
index ff2ebc25ce1..189fe7c631a 100644
--- a/drivers/net/octeontx2/cgx.c
+++ b/drivers/net/octeontx2/cgx.c
@@ -285,7 +285,7 @@  U_BOOT_DRIVER(cgx) = {
 	.id	= UCLASS_MISC,
 	.probe	= cgx_probe,
 	.remove	= cgx_remove,
-	.priv_auto_alloc_size = sizeof(struct cgx),
+	.priv_auto	= sizeof(struct cgx),
 };
 
 static struct pci_device_id cgx_supported[] = {
diff --git a/drivers/net/octeontx2/rvu_af.c b/drivers/net/octeontx2/rvu_af.c
index 7750089a205..d2f96548611 100644
--- a/drivers/net/octeontx2/rvu_af.c
+++ b/drivers/net/octeontx2/rvu_af.c
@@ -160,7 +160,7 @@  U_BOOT_DRIVER(rvu_af) = {
 	.id     = UCLASS_MISC,
 	.probe  = rvu_af_probe,
 	.remove = rvu_af_remove,
-	.priv_auto_alloc_size = sizeof(struct rvu_af),
+	.priv_auto	= sizeof(struct rvu_af),
 };
 
 static struct pci_device_id rvu_af_supported[] = {
diff --git a/drivers/net/octeontx2/rvu_pf.c b/drivers/net/octeontx2/rvu_pf.c
index 853914968bb..fbbd2739987 100644
--- a/drivers/net/octeontx2/rvu_pf.c
+++ b/drivers/net/octeontx2/rvu_pf.c
@@ -104,8 +104,8 @@  U_BOOT_DRIVER(rvu_pf) = {
 	.probe	= rvu_pf_probe,
 	.remove = rvu_pf_remove,
 	.ops    = &nix_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct rvu_pf),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct rvu_pf),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static struct pci_device_id rvu_pf_supported[] = {
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 1daafbe2b9b..b413a4f2491 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -499,8 +499,8 @@  U_BOOT_DRIVER(eth_pch_gbe) = {
 	.probe = pch_gbe_probe,
 	.remove = pch_gbe_remove,
 	.ops = &pch_gbe_ops,
-	.priv_auto_alloc_size = sizeof(struct pch_gbe_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct pch_gbe_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index ad5ac6618f7..9b27033e792 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -689,8 +689,8 @@  U_BOOT_DRIVER(eth_pcnet) = {
 	.bind	= pcnet_bind,
 	.probe	= pcnet_probe,
 	.ops	= &pcnet_ops,
-	.priv_auto_alloc_size = sizeof(struct pcnet_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct pcnet_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_UC_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index 3b4ca0393c0..c5713248500 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -290,6 +290,6 @@  U_BOOT_DRIVER(pfe_eth) = {
 	.probe	= pfe_eth_probe,
 	.remove = pfe_eth_remove,
 	.ops	= &pfe_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct pfe_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct pfe_eth_pdata)
+	.priv_auto	= sizeof(struct pfe_eth_dev),
+	.platdata_auto	= sizeof(struct pfe_eth_pdata)
 };
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 6a2084947b0..ec491256baa 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -606,6 +606,6 @@  U_BOOT_DRIVER(pic32_ethernet) = {
 	.probe			= pic32_eth_probe,
 	.remove			= pic32_eth_remove,
 	.ops			= &pic32_eth_ops,
-	.priv_auto_alloc_size	= sizeof(struct pic32eth_dev),
-	.platdata_auto_alloc_size	= sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct pic32eth_dev),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c
index 3482b3ff178..00e01a41ab3 100644
--- a/drivers/net/qe/dm_qe_uec.c
+++ b/drivers/net/qe/dm_qe_uec.c
@@ -1162,6 +1162,6 @@  U_BOOT_DRIVER(eth_qe_uec) = {
 	.probe	= qe_uec_probe,
 	.remove = qe_uec_remove,
 	.ops	= &qe_uec_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct qe_uec_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct qe_uec_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c
index 02ce08edade..038b810460c 100644
--- a/drivers/net/qe/dm_qe_uec_phy.c
+++ b/drivers/net/qe/dm_qe_uec_phy.c
@@ -159,5 +159,5 @@  U_BOOT_DRIVER(mvmdio) = {
 	.of_match		= qe_uec_mdio_ids,
 	.probe			= qe_uec_mdio_probe,
 	.ops			= &qe_uec_mdio_ops,
-	.priv_auto_alloc_size	= sizeof(struct qe_uec_mdio_priv),
+	.priv_auto	= sizeof(struct qe_uec_mdio_priv),
 };
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 98883cd15b4..d1a45ceedce 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -689,7 +689,7 @@  U_BOOT_DRIVER(eth_ravb) = {
 	.probe		= ravb_probe,
 	.remove		= ravb_remove,
 	.ops		= &ravb_ops,
-	.priv_auto_alloc_size = sizeof(struct ravb_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ravb_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 71f2aba4c70..934e0c25d4a 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -771,8 +771,8 @@  U_BOOT_DRIVER(eth_rtl8139) = {
 	.bind	= rtl8139_bind,
 	.probe	= rtl8139_probe,
 	.ops	= &rtl8139_ops,
-	.priv_auto_alloc_size = sizeof(struct rtl8139_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct rtl8139_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_rtl8139, supported);
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 2e1304e44d1..7512f640c2f 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -1248,8 +1248,8 @@  U_BOOT_DRIVER(eth_rtl8169) = {
 	.of_match = rtl8169_eth_ids,
 	.probe	= rtl8169_eth_probe,
 	.ops	= &rtl8169_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct rtl8169_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct rtl8169_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 U_BOOT_PCI_DEVICE(eth_rtl8169, supported);
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 4bd94c31031..32f63416b96 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -193,6 +193,6 @@  U_BOOT_DRIVER(eth_sandbox_raw) = {
 	.of_match = sb_eth_raw_ids,
 	.ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata,
 	.ops	= &sb_eth_raw_ops,
-	.priv_auto_alloc_size = sizeof(struct eth_sandbox_raw_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct eth_sandbox_raw_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 4f7e3d42438..4d007ae0222 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -446,6 +446,6 @@  U_BOOT_DRIVER(eth_sandbox) = {
 	.ofdata_to_platdata = sb_eth_ofdata_to_platdata,
 	.remove	= sb_eth_remove,
 	.ops	= &sb_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct eth_sandbox_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct eth_sandbox_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 4cbffb14c51..a5bd4596fd5 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -957,8 +957,8 @@  U_BOOT_DRIVER(eth_sh_ether) = {
 	.probe		= sh_ether_probe,
 	.remove		= sh_ether_remove,
 	.ops		= &sh_ether_ops,
-	.priv_auto_alloc_size = sizeof(struct sh_ether_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct sh_ether_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 09372d7f6ba..e0083ce8a33 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -639,8 +639,8 @@  U_BOOT_DRIVER(smc911x) = {
 	.ofdata_to_platdata = smc911x_ofdata_to_platdata,
 	.probe		= smc911x_probe,
 	.ops		= &smc911x_ops,
-	.priv_auto_alloc_size = sizeof(struct smc911x_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct smc911x_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 0f7ada8c3e2..301462009b9 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -998,6 +998,6 @@  U_BOOT_DRIVER(ave) = {
 	.remove	  = ave_remove,
 	.ofdata_to_platdata = ave_ofdata_to_platdata,
 	.ops	  = &ave_ops,
-	.priv_auto_alloc_size = sizeof(struct ave_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ave_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 4524604126c..0fa8ba97b0f 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -1004,7 +1004,7 @@  U_BOOT_DRIVER(eth_sun8i_emac) = {
 	.ofdata_to_platdata = sun8i_emac_eth_ofdata_to_platdata,
 	.probe  = sun8i_emac_eth_probe,
 	.ops    = &sun8i_emac_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct emac_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct sun8i_eth_pdata),
+	.priv_auto	= sizeof(struct emac_eth_dev),
+	.platdata_auto	= sizeof(struct sun8i_eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 8e66ce24611..dfdf3c1f7db 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -612,6 +612,6 @@  U_BOOT_DRIVER(eth_sunxi_emac) = {
 	.ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata,
 	.probe	= sunxi_emac_eth_probe,
 	.ops	= &sunxi_emac_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct emac_eth_dev),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct emac_eth_dev),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 971bdcdfda9..c8dcefe5e35 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -791,7 +791,7 @@  U_BOOT_DRIVER(am65_cpsw_nuss_slave) = {
 	.of_match = am65_cpsw_nuss_ids,
 	.probe	= am65_cpsw_probe_cpsw,
 	.ops	= &am65_cpsw_ops,
-	.priv_auto_alloc_size = sizeof(struct am65_cpsw_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct am65_cpsw_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 1c11257839c..94c10a82340 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -1378,11 +1378,11 @@  U_BOOT_DRIVER(eth_cpsw) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = cpsw_eth_ids,
 	.ofdata_to_platdata = cpsw_eth_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.platdata_auto	= sizeof(struct eth_pdata),
 #endif
 	.probe	= cpsw_eth_probe,
 	.ops	= &cpsw_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct cpsw_priv),
+	.priv_auto	= sizeof(struct cpsw_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_PRE_RELOC,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 56ea1fec0af..2f025018aa5 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -865,5 +865,5 @@  U_BOOT_DRIVER(davinci_emac) = {
 	.of_match	= davinci_emac_ids,
 	.probe		= davinci_emac_probe,
 	.ops		= &davinci_emac_ops,
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 50f0d33a83b..62658bc2128 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -804,8 +804,8 @@  U_BOOT_DRIVER(eth_ks2_slave) = {
 	.probe	= ks2_eth_probe,
 	.remove	= ks2_eth_remove,
 	.ops	= &ks2_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct ks2_eth_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ks2_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
@@ -817,7 +817,7 @@  U_BOOT_DRIVER(eth_ks2) = {
 	.probe	= ks2_eth_probe,
 	.remove	= ks2_eth_remove,
 	.ops	= &ks2_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct ks2_eth_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ks2_eth_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index c436b8317d9..228820484af 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -904,8 +904,8 @@  U_BOOT_DRIVER(eth_tsec) = {
 	.probe = tsec_probe,
 	.remove = tsec_remove,
 	.ops = &tsec_ops,
-	.priv_auto_alloc_size = sizeof(struct tsec_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct tsec_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 3fe9a617f7b..bb66492ec2a 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -791,6 +791,6 @@  U_BOOT_DRIVER(axi_emac) = {
 	.probe	= axi_emac_probe,
 	.remove	= axi_emac_remove,
 	.ops	= &axi_emac_ops,
-	.priv_auto_alloc_size = sizeof(struct axidma_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct axidma_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 256d073da4a..818e7f4811e 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -635,6 +635,6 @@  U_BOOT_DRIVER(emaclite) = {
 	.probe  = emaclite_probe,
 	.remove = emaclite_remove,
 	.ops    = &emaclite_ops,
-	.priv_auto_alloc_size = sizeof(struct xemaclite),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct xemaclite),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 75a6f8f280b..91adffe5284 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -811,6 +811,6 @@  U_BOOT_DRIVER(zynq_gem) = {
 	.probe	= zynq_gem_probe,
 	.remove	= zynq_gem_remove,
 	.ops	= &zynq_gem_ops,
-	.priv_auto_alloc_size = sizeof(struct zynq_gem_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct zynq_gem_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index fc64d93ab83..b7855499973 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -795,7 +795,7 @@  U_BOOT_DRIVER(nvme_blk) = {
 	.id	= UCLASS_BLK,
 	.probe	= nvme_blk_probe,
 	.ops	= &nvme_blk_ops,
-	.priv_auto_alloc_size = sizeof(struct nvme_ns),
+	.priv_auto	= sizeof(struct nvme_ns),
 };
 
 static int nvme_bind(struct udevice *udev)
@@ -869,7 +869,7 @@  U_BOOT_DRIVER(nvme) = {
 	.id	= UCLASS_NVME,
 	.bind	= nvme_bind,
 	.probe	= nvme_probe,
-	.priv_auto_alloc_size = sizeof(struct nvme_dev),
+	.priv_auto	= sizeof(struct nvme_dev),
 };
 
 struct pci_device_id nvme_supported[] = {
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index 76f552527e3..37c368954b4 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -82,5 +82,5 @@  U_BOOT_DRIVER(sandbox_pch_drv) = {
 	.id		= UCLASS_PCH,
 	.of_match	= sandbox_pch_ids,
 	.ops		= &sandbox_pch_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_pch_priv),
+	.priv_auto	= sizeof(struct sandbox_pch_priv),
 };
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 0ce60ddf7db..2ce23ec7805 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -701,5 +701,5 @@  U_BOOT_DRIVER(pcie_advk) = {
 	.probe			= pcie_advk_probe,
 	.remove			= pcie_advk_remove,
 	.flags			= DM_FLAG_OS_PREPARE,
-	.priv_auto_alloc_size	= sizeof(struct pcie_advk),
+	.priv_auto	= sizeof(struct pcie_advk),
 };
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index a52064341e0..3ca9a1567c9 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -105,14 +105,14 @@  UCLASS_DRIVER(pci_emul) = {
 	.name		= "pci_emul",
 	.post_probe	= sandbox_pci_emul_post_probe,
 	.pre_remove	= sandbox_pci_emul_pre_remove,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_pci_emul_priv),
-	.per_device_auto_alloc_size	= sizeof(struct pci_emul_uc_priv),
+	.priv_auto	= sizeof(struct sandbox_pci_emul_priv),
+	.per_device_auto	= sizeof(struct pci_emul_uc_priv),
 };
 
 /*
  * This uclass is a child of the pci bus. Its platdata is not defined here so
  * is defined by its parent, UCLASS_PCI, which uses struct pci_child_platdata.
- * See per_child_platdata_auto_alloc_size in UCLASS_DRIVER(pci).
+ * See per_child_platdata_auto	in UCLASS_DRIVER(pci).
  */
 UCLASS_DRIVER(pci_emul_parent) = {
 	.id		= UCLASS_PCI_EMUL_PARENT,
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index e76abc1f84c..cff1a41f024 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -260,5 +260,5 @@  U_BOOT_DRIVER(rcar_gen2_pci) = {
 	.ops			= &rcar_gen2_pci_ops,
 	.probe			= rcar_gen2_pci_probe,
 	.ofdata_to_platdata	= rcar_gen2_pci_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct rcar_gen2_pci_priv),
+	.priv_auto	= sizeof(struct rcar_gen2_pci_priv),
 };
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 1f51854ccc6..f01fcf61062 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -400,5 +400,5 @@  U_BOOT_DRIVER(rcar_gen3_pcie) = {
 	.ops			= &rcar_gen3_pcie_ops,
 	.probe			= rcar_gen3_pcie_probe,
 	.ofdata_to_platdata	= rcar_gen3_pcie_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rcar_gen3_pcie_priv),
+	.platdata_auto	= sizeof(struct rcar_gen3_pcie_priv),
 };
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index abc3de84db3..c96a0c844b3 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1788,8 +1788,8 @@  UCLASS_DRIVER(pci) = {
 	.pre_probe	= pci_uclass_pre_probe,
 	.post_probe	= pci_uclass_post_probe,
 	.child_post_bind = pci_uclass_child_post_bind,
-	.per_device_auto_alloc_size = sizeof(struct pci_controller),
-	.per_child_platdata_auto_alloc_size =
+	.per_device_auto	= sizeof(struct pci_controller),
+	.per_child_platdata_auto	=
 			sizeof(struct pci_child_platdata),
 };
 
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index 6576f53f52a..9cb95da1753 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -155,5 +155,5 @@  U_BOOT_DRIVER(mpc85xx_pci) = {
 	.probe			= mpc85xx_pci_dm_probe,
 	.remove			= mpc85xx_pci_dm_remove,
 	.ofdata_to_platdata	= mpc85xx_pci_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct mpc85xx_pci_priv),
+	.priv_auto	= sizeof(struct mpc85xx_pci_priv),
 };
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index ba1c139dbc5..207ae336249 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -471,7 +471,7 @@  static struct driver pcie_mvebu_drv = {
 	.ops			= &mvebu_pcie_ops,
 	.probe			= mvebu_pcie_probe,
 	.ofdata_to_platdata	= mvebu_pcie_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_pcie),
+	.platdata_auto	= sizeof(struct mvebu_pcie),
 };
 
 /*
diff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c
index 30537543a0f..d211d22226e 100644
--- a/drivers/pci/pci_octeontx.c
+++ b/drivers/pci/pci_octeontx.c
@@ -359,6 +359,6 @@  U_BOOT_DRIVER(pci_octeontx) = {
 	.ops	= &pci_octeontx_ops,
 	.ofdata_to_platdata = pci_octeontx_ofdata_to_platdata,
 	.probe	= pci_octeontx_probe,
-	.priv_auto_alloc_size = sizeof(struct octeontx_pci),
+	.priv_auto	= sizeof(struct octeontx_pci),
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c
index 8745f286bd4..d318b33d2bd 100644
--- a/drivers/pci/pci_sandbox.c
+++ b/drivers/pci/pci_sandbox.c
@@ -128,10 +128,10 @@  U_BOOT_DRIVER(pci_sandbox) = {
 	.of_match = sandbox_pci_ids,
 	.ops	= &sandbox_pci_ops,
 	.probe	= sandbox_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_pci_priv),
+	.priv_auto	= sizeof(struct sandbox_pci_priv),
 
 	/* Attach an emulator if we can */
 	.child_post_bind = dm_scan_fdt_dev,
-	.per_child_platdata_auto_alloc_size =
+	.per_child_platdata_auto	=
 			sizeof(struct pci_child_platdata),
 };
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 82f5c59d917..386b25a77aa 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -1199,5 +1199,5 @@  U_BOOT_DRIVER(pci_tegra) = {
 	.ops	= &pci_tegra_ops,
 	.ofdata_to_platdata = pci_tegra_ofdata_to_platdata,
 	.probe	= pci_tegra_probe,
-	.priv_auto_alloc_size = sizeof(struct tegra_pcie),
+	.priv_auto	= sizeof(struct tegra_pcie),
 };
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index dade79e9c86..8f084df4882 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -619,5 +619,5 @@  U_BOOT_DRIVER(pcie_brcm_base) = {
 	.of_match		= brcm_pcie_ids,
 	.probe			= brcm_pcie_probe,
 	.ofdata_to_platdata	= brcm_pcie_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct brcm_pcie),
+	.priv_auto	= sizeof(struct brcm_pcie),
 };
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 8fbc8fb7d0a..cacb5e98e7b 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -580,5 +580,5 @@  U_BOOT_DRIVER(pcie_dw_mvebu) = {
 	.ops			= &pcie_dw_mvebu_ops,
 	.ofdata_to_platdata	= pcie_dw_mvebu_ofdata_to_platdata,
 	.probe			= pcie_dw_mvebu_probe,
-	.priv_auto_alloc_size	= sizeof(struct pcie_dw_mvebu),
+	.priv_auto	= sizeof(struct pcie_dw_mvebu),
 };
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index e0635e07c21..20444d990e1 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -726,5 +726,5 @@  U_BOOT_DRIVER(pcie_dw_ti) = {
 	.ops			= &pcie_dw_ti_ops,
 	.ofdata_to_platdata	= pcie_dw_ti_ofdata_to_platdata,
 	.probe			= pcie_dw_ti_probe,
-	.priv_auto_alloc_size	= sizeof(struct pcie_dw_ti),
+	.priv_auto	= sizeof(struct pcie_dw_ti),
 };
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 96afa4263df..1e06b7b6e0b 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -168,5 +168,5 @@  U_BOOT_DRIVER(pci_generic_ecam) = {
 	.ops			= &pci_generic_ecam_ops,
 	.probe			= pci_generic_ecam_probe,
 	.ofdata_to_platdata	= pci_generic_ecam_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct generic_ecam_pcie),
+	.priv_auto	= sizeof(struct generic_ecam_pcie),
 };
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index da6a6b15534..7e68c0a9d02 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -663,5 +663,5 @@  U_BOOT_DRIVER(fsl_pcie) = {
 	.ops = &fsl_pcie_ops,
 	.ofdata_to_platdata = fsl_pcie_ofdata_to_platdata,
 	.probe = fsl_pcie_probe,
-	.priv_auto_alloc_size = sizeof(struct fsl_pcie),
+	.priv_auto	= sizeof(struct fsl_pcie),
 };
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index cbf12371a0f..ebf9b8813da 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -830,7 +830,7 @@  U_BOOT_DRIVER(imx_pcie) = {
 	.probe			= imx_pcie_dm_probe,
 	.remove			= imx_pcie_dm_remove,
 	.ofdata_to_platdata	= imx_pcie_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct imx_pcie_priv),
+	.priv_auto	= sizeof(struct imx_pcie_priv),
 	.flags			= DM_FLAG_OS_PREPARE,
 };
 #endif
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index cafb02195f0..641a770ee56 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -430,5 +430,5 @@  U_BOOT_DRIVER(pcie_intel_fpga) = {
 	.ops			= &pcie_intel_fpga_ops,
 	.ofdata_to_platdata	= pcie_intel_fpga_ofdata_to_platdata,
 	.probe			= pcie_intel_fpga_probe,
-	.priv_auto_alloc_size	= sizeof(struct intel_fpga_pcie),
+	.priv_auto	= sizeof(struct intel_fpga_pcie),
 };
diff --git a/drivers/pci/pcie_iproc.c b/drivers/pci/pcie_iproc.c
index d77735fcf26..6725ff64372 100644
--- a/drivers/pci/pcie_iproc.c
+++ b/drivers/pci/pcie_iproc.c
@@ -1282,6 +1282,6 @@  U_BOOT_DRIVER(pci_iproc) = {
 	.ops = &iproc_pcie_ops,
 	.probe = iproc_pcie_probe,
 	.remove = iproc_pcie_remove,
-	.priv_auto_alloc_size = sizeof(struct iproc_pcie),
+	.priv_auto	= sizeof(struct iproc_pcie),
 	.flags = DM_REMOVE_OS_PREPARE,
 };
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e3a5f..1503f961e2d 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -328,5 +328,5 @@  U_BOOT_DRIVER(pci_layerscape_ep) = {
 	.ops = &ls_pcie_ep_ops,
 	.probe = ls_pcie_ep_probe,
 	.remove = ls_pcie_ep_remove,
-	.priv_auto_alloc_size = sizeof(struct ls_pcie_ep),
+	.priv_auto	= sizeof(struct ls_pcie_ep),
 };
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index d6efdd3ed63..62bfbd9a86a 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -569,5 +569,5 @@  U_BOOT_DRIVER(pcie_layerscape_gen4) = {
 	.of_match = ls_pcie_g4_ids,
 	.ops = &ls_pcie_g4_ops,
 	.probe	= ls_pcie_g4_probe,
-	.priv_auto_alloc_size = sizeof(struct ls_pcie_g4),
+	.priv_auto	= sizeof(struct ls_pcie_g4),
 };
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 241acbdc449..c4e6099a597 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -375,5 +375,5 @@  U_BOOT_DRIVER(pci_layerscape) = {
 	.of_match = ls_pcie_ids,
 	.ops = &ls_pcie_ops,
 	.probe	= ls_pcie_probe,
-	.priv_auto_alloc_size = sizeof(struct ls_pcie_rc),
+	.priv_auto	= sizeof(struct ls_pcie_rc),
 };
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 5bd11661c3c..82770aca4f7 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -728,7 +728,7 @@  U_BOOT_DRIVER(pcie_mediatek_v1) = {
 	.of_match = mtk_pcie_ids,
 	.ops	= &mtk_pcie_ops,
 	.probe	= mtk_pcie_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pcie),
+	.priv_auto	= sizeof(struct mtk_pcie),
 };
 
 static const struct udevice_id mtk_pcie_ids_v2[] = {
@@ -742,5 +742,5 @@  U_BOOT_DRIVER(pcie_mediatek_v2) = {
 	.of_match = mtk_pcie_ids_v2,
 	.ops	= &mtk_pcie_ops_v2,
 	.probe	= mtk_pcie_probe_v2,
-	.priv_auto_alloc_size = sizeof(struct mtk_pcie),
+	.priv_auto	= sizeof(struct mtk_pcie),
 };
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 51b2171f9fa..cce78714b30 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -195,5 +195,5 @@  U_BOOT_DRIVER(pci_phytium) = {
 	.of_match		= pci_phytium_ids,
 	.ops			= &pci_phytium_ops,
 	.ofdata_to_platdata	= pci_phytium_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct phytium_pcie),
+	.priv_auto	= sizeof(struct phytium_pcie),
 };
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 96173b81cc3..027745e42e8 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -565,5 +565,5 @@  U_BOOT_DRIVER(rockchip_pcie) = {
 	.of_match		= rockchip_pcie_ids,
 	.ops			= &rockchip_pcie_ops,
 	.probe			= rockchip_pcie_probe,
-	.priv_auto_alloc_size	= sizeof(struct rockchip_pcie),
+	.priv_auto	= sizeof(struct rockchip_pcie),
 };
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 713ad49d045..7aaee77662b 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -175,5 +175,5 @@  U_BOOT_DRIVER(pcie_xilinx) = {
 	.of_match		= pcie_xilinx_ids,
 	.ops			= &pcie_xilinx_ops,
 	.ofdata_to_platdata	= pcie_xilinx_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct xilinx_pcie),
+	.priv_auto	= sizeof(struct xilinx_pcie),
 };
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 74dfdde154e..7313428fe0c 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -173,5 +173,5 @@  U_BOOT_DRIVER(cdns_pcie) = {
 	.ops = &cdns_pci_ep_ops,
 	.probe = cdns_pci_ep_probe,
 	.remove = cdns_pci_ep_remove,
-	.priv_auto_alloc_size = sizeof(struct cdns_pcie),
+	.priv_auto	= sizeof(struct cdns_pcie),
 };
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index 8e05d5ba890..de148cddb91 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -175,5 +175,5 @@  U_BOOT_DRIVER(pci_ep_sandbox) = {
 	.of_match	= sandbox_pci_ep_ids,
 	.probe		= sandbox_pci_ep_probe,
 	.ops		= &sandbox_pci_ep_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_pci_ep_priv),
+	.priv_auto	= sizeof(struct sandbox_pci_ep_priv),
 };
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 7b9d3eefc5e..aadb2901261 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -646,6 +646,6 @@  U_BOOT_DRIVER(sun4i_usb_phy) = {
 	.of_match = sun4i_usb_phy_ids,
 	.ops = &sun4i_usb_phy_ops,
 	.probe = sun4i_usb_phy_probe,
-	.platdata_auto_alloc_size = sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]),
-	.priv_auto_alloc_size = sizeof(struct sun4i_usb_phy_data),
+	.platdata_auto	= sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]),
+	.priv_auto	= sizeof(struct sun4i_usb_phy_data),
 };
diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index d29344ddb48..60608a55bc2 100644
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-usbh-phy.c
@@ -138,6 +138,6 @@  U_BOOT_DRIVER(bcm6318_usbh) = {
 	.id = UCLASS_PHY,
 	.of_match = bcm6318_usbh_ids,
 	.ops = &bcm6318_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6318_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6318_usbh_priv),
 	.probe = bcm6318_usbh_probe,
 };
diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c
index 8d28292726c..1b6b5ad177e 100644
--- a/drivers/phy/bcm6348-usbh-phy.c
+++ b/drivers/phy/bcm6348-usbh-phy.c
@@ -87,6 +87,6 @@  U_BOOT_DRIVER(bcm6348_usbh) = {
 	.id = UCLASS_PHY,
 	.of_match = bcm6348_usbh_ids,
 	.ops = &bcm6348_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6348_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6348_usbh_priv),
 	.probe = bcm6348_usbh_probe,
 };
diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c
index 501b97f3e21..bfdcfb0d245 100644
--- a/drivers/phy/bcm6358-usbh-phy.c
+++ b/drivers/phy/bcm6358-usbh-phy.c
@@ -87,6 +87,6 @@  U_BOOT_DRIVER(bcm6358_usbh) = {
 	.id = UCLASS_PHY,
 	.of_match = bcm6358_usbh_ids,
 	.ops = &bcm6358_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6358_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6358_usbh_priv),
 	.probe = bcm6358_usbh_probe,
 };
diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 99fdd33499a..4d3a63faada 100644
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c
@@ -191,6 +191,6 @@  U_BOOT_DRIVER(bcm6368_usbh) = {
 	.id = UCLASS_PHY,
 	.of_match = bcm6368_usbh_ids,
 	.ops = &bcm6368_usbh_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6368_usbh_priv),
+	.priv_auto	= sizeof(struct bcm6368_usbh_priv),
 	.probe = bcm6368_usbh_probe,
 };
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 9faf5010033..12f8a265f77 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -130,5 +130,5 @@  U_BOOT_DRIVER(keystone_usb_phy) = {
 	.of_match = keystone_usb_phy_ids,
 	.ops = &keystone_usb_phy_ops,
 	.probe = keystone_usb_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct keystone_usb_phy),
+	.priv_auto	= sizeof(struct keystone_usb_phy),
 };
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 5e8ce740cd6..b2203277c41 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -189,5 +189,5 @@  U_BOOT_DRIVER(mvebu_comphy) = {
 	.id	= UCLASS_MISC,
 	.of_match = comphy_ids,
 	.probe	= comphy_probe,
-	.priv_auto_alloc_size = sizeof(struct chip_serdes_phy_config),
+	.priv_auto	= sizeof(struct chip_serdes_phy_config),
 };
diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c
index 447ce7283db..2fbba7fdae0 100644
--- a/drivers/phy/meson-g12a-usb2.c
+++ b/drivers/phy/meson-g12a-usb2.c
@@ -215,5 +215,5 @@  U_BOOT_DRIVER(meson_g12a_usb2_phy) = {
 	.of_match = meson_g12a_usb2_phy_ids,
 	.probe = meson_g12a_usb2_phy_probe,
 	.ops = &meson_g12a_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_meson_g12a_usb2_priv),
+	.priv_auto	= sizeof(struct phy_meson_g12a_usb2_priv),
 };
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index 4e9696fd590..0433d934743 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -343,5 +343,5 @@  U_BOOT_DRIVER(meson_g12a_usb3_pcie_phy) = {
 	.of_match = meson_g12a_usb3_pcie_phy_ids,
 	.probe = meson_g12a_usb3_pcie_phy_probe,
 	.ops = &meson_g12a_usb3_pcie_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_g12a_usb3_pcie_priv),
+	.priv_auto	= sizeof(struct phy_g12a_usb3_pcie_priv),
 };
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index d1beebee43e..7a2e3d2739e 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -232,5 +232,5 @@  U_BOOT_DRIVER(meson_gxbb_usb2_phy) = {
 	.probe = meson_gxbb_usb2_phy_probe,
 	.remove = meson_gxbb_usb2_phy_remove,
 	.ops = &meson_gxbb_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
+	.priv_auto	= sizeof(struct phy_meson_gxbb_usb2_priv),
 };
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index 2267bd08c2c..9fb376cec44 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -251,5 +251,5 @@  U_BOOT_DRIVER(meson_gxl_usb2_phy) = {
 	.of_match = meson_gxl_usb2_phy_ids,
 	.probe = meson_gxl_usb2_phy_probe,
 	.ops = &meson_gxl_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct phy_meson_gxl_usb2_priv),
+	.priv_auto	= sizeof(struct phy_meson_gxl_usb2_priv),
 };
diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c
index 4efaddd701c..7c9d030a4d8 100644
--- a/drivers/phy/msm8916-usbh-phy.c
+++ b/drivers/phy/msm8916-usbh-phy.c
@@ -106,5 +106,5 @@  U_BOOT_DRIVER(msm8916_usbphy) = {
 	.of_match	= msm_phy_ids,
 	.ops		= &msm_phy_ops,
 	.probe		= msm_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct msm_phy_priv),
+	.priv_auto	= sizeof(struct msm_phy_priv),
 };
diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
index 4c0818f6e8d..4069208b679 100644
--- a/drivers/phy/mt76x8-usb-phy.c
+++ b/drivers/phy/mt76x8-usb-phy.c
@@ -248,5 +248,5 @@  U_BOOT_DRIVER(mt76x8_usb_phy) = {
 	.of_match	= mt76x8_usb_phy_ids,
 	.ops		= &mt76x8_usb_phy_ops,
 	.probe		= mt76x8_usb_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct mt76x8_usb_phy),
+	.priv_auto	= sizeof(struct mt76x8_usb_phy),
 };
diff --git a/drivers/phy/nop-phy.c b/drivers/phy/nop-phy.c
index ba71785fe42..84aac806230 100644
--- a/drivers/phy/nop-phy.c
+++ b/drivers/phy/nop-phy.c
@@ -56,5 +56,5 @@  U_BOOT_DRIVER(nop_phy) = {
 	.of_match = nop_phy_ids,
 	.ops = &nop_phy_ops,
 	.probe = nop_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct nop_phy_priv),
+	.priv_auto	= sizeof(struct nop_phy_priv),
 };
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index a981cb2f8d6..cb991437321 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -261,5 +261,5 @@  U_BOOT_DRIVER(omap_usb2_phy) = {
 	.of_match = omap_usb2_id_table,
 	.probe = omap_usb2_phy_probe,
 	.ops = &omap_usb2_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct omap_usb2_phy),
+	.priv_auto	= sizeof(struct omap_usb2_phy),
 };
diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c
index 36c77c4b639..9f7c983ce42 100644
--- a/drivers/phy/phy-bcm-sr-pcie.c
+++ b/drivers/phy/phy-bcm-sr-pcie.c
@@ -172,6 +172,6 @@  U_BOOT_DRIVER(sr_pcie_phy) = {
 	.probe = sr_pcie_phy_probe,
 	.of_match = sr_pcie_phy_match_table,
 	.ops = &sr_pcie_phy_ops,
-	.platdata_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
-	.priv_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
+	.platdata_auto	= sizeof(struct sr_pcie_phy_core),
+	.priv_auto	= sizeof(struct sr_pcie_phy_core),
 };
diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c
index 3d7b9cd2b12..824244b8528 100644
--- a/drivers/phy/phy-mtk-tphy.c
+++ b/drivers/phy/phy-mtk-tphy.c
@@ -749,5 +749,5 @@  U_BOOT_DRIVER(mtk_tphy) = {
 	.of_match	= mtk_tphy_id_table,
 	.ops		= &mtk_tphy_ops,
 	.probe		= mtk_tphy_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_tphy),
+	.priv_auto	= sizeof(struct mtk_tphy),
 };
diff --git a/drivers/phy/phy-qcom-ipq4019-usb.c b/drivers/phy/phy-qcom-ipq4019-usb.c
index 465f0d3a01e..5808489249f 100644
--- a/drivers/phy/phy-qcom-ipq4019-usb.c
+++ b/drivers/phy/phy-qcom-ipq4019-usb.c
@@ -75,7 +75,7 @@  U_BOOT_DRIVER(ipq4019_usb_ss_phy) = {
 	.of_match	= ipq4019_usb_ss_phy_ids,
 	.ops		= &ipq4019_usb_ss_phy_ops,
 	.probe		= ipq4019_usb_ss_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct ipq4019_usb_phy),
+	.priv_auto	= sizeof(struct ipq4019_usb_phy),
 };
 
 static int ipq4019_hs_phy_power_off(struct phy *_phy)
@@ -141,5 +141,5 @@  U_BOOT_DRIVER(ipq4019_usb_hs_phy) = {
 	.of_match	= ipq4019_usb_hs_phy_ids,
 	.ops		= &ipq4019_usb_hs_phy_ops,
 	.probe		= ipq4019_usb_hs_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct ipq4019_usb_phy),
+	.priv_auto	= sizeof(struct ipq4019_usb_phy),
 };
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 18da86e4bea..17940959246 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -189,5 +189,5 @@  U_BOOT_DRIVER(rcar_gen2_phy) = {
 	.ops		= &rcar_gen2_phy_phy_ops,
 	.probe		= rcar_gen2_phy_probe,
 	.remove		= rcar_gen2_phy_remove,
-	.priv_auto_alloc_size = sizeof(struct rcar_gen2_phy),
+	.priv_auto	= sizeof(struct rcar_gen2_phy),
 };
diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
index ce39cd8f9e2..8c59631428b 100644
--- a/drivers/phy/phy-rcar-gen3.c
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -158,5 +158,5 @@  U_BOOT_DRIVER(rcar_gen3_phy) = {
 	.ops		= &rcar_gen3_phy_phy_ops,
 	.probe		= rcar_gen3_phy_probe,
 	.remove		= rcar_gen3_phy_remove,
-	.priv_auto_alloc_size = sizeof(struct rcar_gen3_phy),
+	.priv_auto	= sizeof(struct rcar_gen3_phy),
 };
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index ab4a913c934..f23aef4fb01 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -419,5 +419,5 @@  U_BOOT_DRIVER(stm32_usb_phyc) = {
 	.of_match = stm32_usbphyc_of_match,
 	.ops = &stm32_usbphyc_phy_ops,
 	.probe = stm32_usbphyc_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_usbphyc),
+	.priv_auto	= sizeof(struct stm32_usbphyc),
 };
diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
index cc73760c8be..8e35ea14750 100644
--- a/drivers/phy/phy-ti-am654.c
+++ b/drivers/phy/phy-ti-am654.c
@@ -187,7 +187,7 @@  U_BOOT_DRIVER(serdes_am654_mux_clk) = {
 	.name = "ti-serdes-am654-mux-clk",
 	.id = UCLASS_CLK,
 	.probe = serdes_am654_mux_clk_probe,
-	.priv_auto_alloc_size = sizeof(struct serdes_am654_mux_clk_data),
+	.priv_auto	= sizeof(struct serdes_am654_mux_clk_data),
 	.ops = &serdes_am654_mux_clk_ops,
 };
 
@@ -412,5 +412,5 @@  U_BOOT_DRIVER(am654_serdes_phy) = {
 	.bind = serdes_am654_bind,
 	.ops = &serdes_am654_phy_ops,
 	.probe = serdes_am654_probe,
-	.priv_auto_alloc_size = sizeof(struct serdes_am654),
+	.priv_auto	= sizeof(struct serdes_am654),
 };
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index c5ea6ca31f1..6744b8b2275 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -308,5 +308,5 @@  U_BOOT_DRIVER(rockchip_usb2phy) = {
 	.of_match = rockchip_usb2phy_ids,
 	.probe = rockchip_usb2phy_probe,
 	.bind = rockchip_usb2phy_bind,
-	.priv_auto_alloc_size = sizeof(struct rockchip_usb2phy),
+	.priv_auto	= sizeof(struct rockchip_usb2phy),
 };
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 617943fd821..bc6c0feed04 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -267,5 +267,5 @@  U_BOOT_DRIVER(rockchip_pcie_phy) = {
 	.of_match = rockchip_pcie_phy_ids,
 	.ops = &rockchip_pcie_phy_ops,
 	.probe = rockchip_pcie_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pcie_phy),
+	.priv_auto	= sizeof(struct rockchip_pcie_phy),
 };
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index da00daa4476..a45a318e474 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -792,5 +792,5 @@  U_BOOT_DRIVER(rockchip_typec_phy) = {
 	.of_match = rockchip_typec_phy_ids,
 	.probe = rockchip_tcphy_probe,
 	.bind = rockchip_tcphy_bind,
-	.priv_auto_alloc_size = sizeof(struct rockchip_tcphy),
+	.priv_auto	= sizeof(struct rockchip_tcphy),
 };
diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c
index 5f36da7692b..7b3d988613b 100644
--- a/drivers/phy/sandbox-phy.c
+++ b/drivers/phy/sandbox-phy.c
@@ -116,5 +116,5 @@  U_BOOT_DRIVER(phy_sandbox) = {
 	.of_match	= sandbox_phy_ids,
 	.ops		= &sandbox_phy_ops,
 	.probe		= sandbox_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_phy_priv),
+	.priv_auto	= sizeof(struct sandbox_phy_priv),
 };
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 2a20f7601c0..6a7c3565ea3 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -177,5 +177,5 @@  U_BOOT_DRIVER(sti_usb_phy) = {
 	.of_match = sti_usb_phy_ids,
 	.probe = sti_usb_phy_probe,
 	.ops = &sti_usb_phy_ops,
-	.priv_auto_alloc_size = sizeof(struct sti_usb_phy),
+	.priv_auto	= sizeof(struct sti_usb_phy),
 };
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 3f49851bcab..98fe6c6fce3 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -604,5 +604,5 @@  U_BOOT_DRIVER(pipe3_phy) = {
 	.of_match = pipe3_phy_ids,
 	.ops = &pipe3_phy_ops,
 	.probe = pipe3_phy_probe,
-	.priv_auto_alloc_size = sizeof(struct omap_pipe3),
+	.priv_auto	= sizeof(struct omap_pipe3),
 };
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 05ef24864f2..3c2e10b88e8 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -121,7 +121,7 @@  U_BOOT_DRIVER(pinctrl_ast2500) = {
 	.name = "aspeed_ast2500_pinctrl",
 	.id = UCLASS_PINCTRL,
 	.of_match = ast2500_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct ast2500_pinctrl_priv),
+	.priv_auto	= sizeof(struct ast2500_pinctrl_priv),
 	.ops = &ast2500_pinctrl_ops,
 	.probe = ast2500_pinctrl_probe,
 };
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index 61e80818743..14408da2e7e 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -130,7 +130,7 @@  U_BOOT_DRIVER(pinctrl_ar933x) = {
 	.name		= "pinctrl_ar933x",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= ar933x_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct ar933x_pinctrl_priv),
+	.priv_auto	= sizeof(struct ar933x_pinctrl_priv),
 	.ops		= &ar933x_pinctrl_ops,
 	.probe		= ar933x_pinctrl_probe,
 };
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 2d5a4a3ab23..b1c78bead3b 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -150,7 +150,7 @@  U_BOOT_DRIVER(pinctrl_qca953x) = {
 	.name		= "pinctrl_qca953x",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= qca953x_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct qca953x_pinctrl_priv),
+	.priv_auto	= sizeof(struct qca953x_pinctrl_priv),
 	.ops		= &qca953x_pinctrl_ops,
 	.probe		= qca953x_pinctrl_probe,
 };
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index 5f5f3f3622f..42e05b0e707 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -150,7 +150,7 @@  U_BOOT_DRIVER(pinctrl_bcm283x) = {
 	.id		= UCLASS_PINCTRL,
 	.of_match	= of_match_ptr(bcm2835_pinctrl_id),
 	.ofdata_to_platdata = bcm283x_pinctl_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct bcm283x_pinctrl_priv),
+	.priv_auto	= sizeof(struct bcm283x_pinctrl_priv),
 	.ops		= &bcm283x_pinctrl_ops,
 	.probe		= bcm283x_pinctl_probe,
 #if CONFIG_IS_ENABLED(OF_BOARD)
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index 6c8a990f57b..58f28a13709 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -157,6 +157,6 @@  U_BOOT_DRIVER(bcm6838_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = bcm6838_pinctrl_match,
 	.ops = &bcm6838_pinctrl_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6838_pinctrl_priv),
+	.priv_auto	= sizeof(struct bcm6838_pinctrl_priv),
 	.probe = bcm6838_pinctrl_probe,
 };
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index ff6d6c4143f..07870b7f51a 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -110,7 +110,7 @@  U_BOOT_DRIVER(pinctrl_exynos7420) = {
 	.name		= "pinctrl_exynos7420",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= exynos7420_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct exynos_pinctrl_priv),
+	.priv_auto	= sizeof(struct exynos_pinctrl_priv),
 	.ops		= &exynos7420_pinctrl_ops,
 	.probe		= exynos_pinctrl_probe,
 };
diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index 727bacfd043..149d5119124 100644
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -184,6 +184,6 @@  U_BOOT_DRIVER(intel_apl_pinctrl) = {
 	.bind		= dm_scan_fdt_dev,
 #endif
 	.ofdata_to_platdata = apl_pinctrl_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct intel_pinctrl_priv),
-	.platdata_auto_alloc_size = sizeof(struct apl_gpio_platdata),
+	.priv_auto	= sizeof(struct intel_pinctrl_priv),
+	.platdata_auto	= sizeof(struct apl_gpio_platdata),
 };
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index 1aa323c009a..b413a4c7e48 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -748,7 +748,7 @@  U_BOOT_DRIVER(mt7622_pinctrl) = {
 	.of_match = mt7622_pctrl_match,
 	.ops = &mtk_pinctrl_ops,
 	.probe = mtk_pinctrl_mt7622_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv),
+	.priv_auto	= sizeof(struct mtk_pinctrl_priv),
 };
 
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7623.c b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
index 0f5dcb2c639..2e3ae34b8ba 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7623.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
@@ -1411,5 +1411,5 @@  U_BOOT_DRIVER(mt7623_pinctrl) = {
 	.of_match = mt7623_pctrl_match,
 	.ops = &mtk_pinctrl_ops,
 	.probe = mtk_pinctrl_mt7623_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv),
+	.priv_auto	= sizeof(struct mtk_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7629.c b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
index 37640dd2b6d..7ce64fde25f 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7629.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
@@ -407,5 +407,5 @@  U_BOOT_DRIVER(mt7629_pinctrl) = {
 	.of_match = mt7629_pctrl_match,
 	.ops = &mtk_pinctrl_ops,
 	.probe = mtk_pinctrl_mt7629_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv),
+	.priv_auto	= sizeof(struct mtk_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8512.c b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
index bf2a8dd90f0..3d9c0abe36b 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8512.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
@@ -383,5 +383,5 @@  U_BOOT_DRIVER(mt8512_pinctrl) = {
 	.of_match = mt8512_pctrl_match,
 	.ops = &mtk_pinctrl_ops,
 	.probe = mtk_pinctrl_mt8512_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv),
+	.priv_auto	= sizeof(struct mtk_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
index 62e339e9310..6f94f762d98 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -389,5 +389,5 @@  U_BOOT_DRIVER(mt8516_pinctrl) = {
 	.of_match = mt8516_pctrl_match,
 	.ops = &mtk_pinctrl_ops,
 	.probe = mtk_pinctrl_mt8516_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv),
+	.priv_auto	= sizeof(struct mtk_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8518.c b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
index 91427aed4b9..ed51bd3bbc0 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8518.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
@@ -409,5 +409,5 @@  U_BOOT_DRIVER(mt8518_pinctrl) = {
 	.of_match = mt8518_pctrl_match,
 	.ops = &mtk_pinctrl_ops,
 	.probe = mtk_pinctrl_mt8518_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv),
+	.priv_auto	= sizeof(struct mtk_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 11809b29f39..5d234bca3d4 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -975,6 +975,6 @@  U_BOOT_DRIVER(meson_axg_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(meson_axg_pinctrl_match),
 	.probe = meson_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_pinctrl),
+	.priv_auto	= sizeof(struct meson_pinctrl),
 	.ops = &meson_axg_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 115e8b5616d..8bd265ad952 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -1289,6 +1289,6 @@  U_BOOT_DRIVER(meson_axg_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(meson_g12a_pinctrl_match),
 	.probe = meson_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_pinctrl),
+	.priv_auto	= sizeof(struct meson_pinctrl),
 	.ops = &meson_axg_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 9e2e1511645..8c01c739068 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -472,6 +472,6 @@  U_BOOT_DRIVER(meson_gxbb_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(meson_gxbb_pinctrl_match),
 	.probe = meson_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_pinctrl),
+	.priv_auto	= sizeof(struct meson_pinctrl),
 	.ops = &meson_gx_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 5acc21b9c2e..51a0b4c5cad 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -734,6 +734,6 @@  U_BOOT_DRIVER(meson_gxl_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(meson_gxl_pinctrl_match),
 	.probe = meson_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_pinctrl),
+	.priv_auto	= sizeof(struct meson_pinctrl),
 	.ops = &meson_gx_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c
index 6de7a416f0e..cb340581cc0 100644
--- a/drivers/pinctrl/mscc/pinctrl-jr2.c
+++ b/drivers/pinctrl/mscc/pinctrl-jr2.c
@@ -318,6 +318,6 @@  U_BOOT_DRIVER(jr2_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(jr2_pinctrl_of_match),
 	.probe = jr2_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-luton.c b/drivers/pinctrl/mscc/pinctrl-luton.c
index 0adeef9ec67..325c9a9705b 100644
--- a/drivers/pinctrl/mscc/pinctrl-luton.c
+++ b/drivers/pinctrl/mscc/pinctrl-luton.c
@@ -181,6 +181,6 @@  U_BOOT_DRIVER(luton_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(luton_pinctrl_of_match),
 	.probe = luton_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-ocelot.c b/drivers/pinctrl/mscc/pinctrl-ocelot.c
index 4df5eef1b10..57e2ef0d7c1 100644
--- a/drivers/pinctrl/mscc/pinctrl-ocelot.c
+++ b/drivers/pinctrl/mscc/pinctrl-ocelot.c
@@ -197,6 +197,6 @@  U_BOOT_DRIVER(ocelot_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(ocelot_pinctrl_of_match),
 	.probe = ocelot_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-serval.c b/drivers/pinctrl/mscc/pinctrl-serval.c
index 2cef5df3dc2..a6b9796df81 100644
--- a/drivers/pinctrl/mscc/pinctrl-serval.c
+++ b/drivers/pinctrl/mscc/pinctrl-serval.c
@@ -228,6 +228,6 @@  U_BOOT_DRIVER(serval_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(serval_pinctrl_of_match),
 	.probe = serval_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mscc/pinctrl-servalt.c b/drivers/pinctrl/mscc/pinctrl-servalt.c
index 37ce52ce7b8..8e8678580db 100644
--- a/drivers/pinctrl/mscc/pinctrl-servalt.c
+++ b/drivers/pinctrl/mscc/pinctrl-servalt.c
@@ -264,6 +264,6 @@  U_BOOT_DRIVER(servalt_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(servalt_pinctrl_of_match),
 	.probe = servalt_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mscc_pinctrl),
+	.priv_auto	= sizeof(struct mscc_pinctrl),
 	.ops = &mscc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index fc9d8b5ad10..8edab2f9950 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -581,5 +581,5 @@  U_BOOT_DRIVER(mt7628_pinctrl) = {
 	.ofdata_to_platdata = mt7628_pinctrl_ofdata_to_platdata,
 	.ops = &mt7628_pinctrl_ops,
 	.probe = mt7628_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct mt7628_pinctrl_priv),
+	.priv_auto	= sizeof(struct mt7628_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 17d7603ebdb..4797d3250f9 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -643,6 +643,6 @@  U_BOOT_DRIVER(armada_37xx_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(armada_37xx_pinctrl_of_match),
 	.probe = armada_37xx_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct armada_37xx_pinctrl),
+	.priv_auto	= sizeof(struct armada_37xx_pinctrl),
 	.ops = &armada_37xx_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index 146f5c6e426..5ced4fea888 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -229,7 +229,7 @@  U_BOOT_DRIVER(pinctrl_mvebu) = {
 	.name		= "mvebu_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= mvebu_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct mvebu_pinctrl_priv),
+	.priv_auto	= sizeof(struct mvebu_pinctrl_priv),
 	.ops		= &mvebu_pinctrl_ops,
 	.probe		= mvebu_pinctl_probe
 };
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 96a2ed38a05..adc687a3b57 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -213,7 +213,7 @@  U_BOOT_DRIVER(pinctrl_s5pxx18) = {
 	.name		= "pinctrl_s5pxx18",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= s5pxx18_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct nexell_pinctrl_priv),
+	.priv_auto	= sizeof(struct nexell_pinctrl_priv),
 	.ops		= &s5pxx18_pinctrl_ops,
 	.probe		= nexell_pinctrl_probe,
 	.flags		= DM_FLAG_PRE_RELOC
diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c
index 9c3423bef37..71e0c94c96e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx5.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx5.c
@@ -38,7 +38,7 @@  U_BOOT_DRIVER(imx5_pinctrl) = {
 	.of_match = of_match_ptr(imx5_pinctrl_match),
 	.probe = imx5_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c
index 84004e59212..3cb0bf3b5af 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx6.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx6.c
@@ -47,7 +47,7 @@  U_BOOT_DRIVER(fsl_imx6q_iomuxc) = {
 	.of_match = of_match_ptr(imx6_pinctrl_match),
 	.probe = imx6_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c
index 66b58ba472c..8301413ac7e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx7.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx7.c
@@ -35,7 +35,7 @@  U_BOOT_DRIVER(imx7_pinctrl) = {
 	.of_match = of_match_ptr(imx7_pinctrl_match),
 	.probe = imx7_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
index 598bbfaf350..da0f6c9ba0e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
@@ -39,7 +39,7 @@  U_BOOT_DRIVER(imx7ulp_pinctrl) = {
 	.of_match = of_match_ptr(imx7ulp_pinctrl_match),
 	.probe = imx7ulp_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c
index c1b0ca438aa..2e5db2c6c2f 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8.c
@@ -35,7 +35,7 @@  U_BOOT_DRIVER(imx8_pinctrl) = {
 	.of_match = of_match_ptr(imx8_pinctrl_match),
 	.probe = imx8_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c
index 0626fde58f1..99c6d014d6c 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8m.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c
@@ -32,7 +32,7 @@  U_BOOT_DRIVER(imx8mq_pinctrl) = {
 	.of_match = of_match_ptr(imx8m_pinctrl_match),
 	.probe = imx8mq_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c
index 4a939419275..53b70da869e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imxrt.c
+++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c
@@ -34,7 +34,7 @@  U_BOOT_DRIVER(imxrt_pinctrl) = {
 	.of_match = of_match_ptr(imxrt_pinctrl_match),
 	.probe = imxrt_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index db463fc04b9..5ada2ac4052 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -188,7 +188,7 @@  U_BOOT_DRIVER(fsl_imx23_pinctrl) = {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
 #endif
-	.priv_auto_alloc_size = sizeof(struct mxs_pinctrl_priv),
+	.priv_auto	= sizeof(struct mxs_pinctrl_priv),
 	.ops = &mxs_pinctrl_ops,
 };
 
diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c
index e795b5fd8ac..14e2e9d3ee6 100644
--- a/drivers/pinctrl/nxp/pinctrl-vf610.c
+++ b/drivers/pinctrl/nxp/pinctrl-vf610.c
@@ -34,7 +34,7 @@  U_BOOT_DRIVER(vf610_pinctrl) = {
 	.of_match = of_match_ptr(vf610_pinctrl_match),
 	.probe = vf610_pinctrl_probe,
 	.remove = imx_pinctrl_remove,
-	.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
+	.priv_auto	= sizeof(struct imx_pinctrl_priv),
 	.ops = &imx_pinctrl_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index bf85cc916a7..afd440729e2 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -178,6 +178,6 @@  U_BOOT_DRIVER(atmel_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = atmel_pinctrl_match,
 	.probe = atmel_pinctrl_probe,
-	.platdata_auto_alloc_size = sizeof(struct atmel_pio4_platdata),
+	.platdata_auto	= sizeof(struct atmel_pio4_platdata),
 	.ops = &atmel_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index cd7b32ce346..74bfd3c3dca 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -524,7 +524,7 @@  U_BOOT_DRIVER(atmel_sama5d3_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = at91_pinctrl_match,
 	.probe = at91_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct at91_pinctrl_priv),
+	.priv_auto	= sizeof(struct at91_pinctrl_priv),
 	.ops = &at91_pinctrl_ops,
 };
 
diff --git a/drivers/pinctrl/pinctrl-kendryte.c b/drivers/pinctrl/pinctrl-kendryte.c
index 04162016ccd..09d51ca6769 100644
--- a/drivers/pinctrl/pinctrl-kendryte.c
+++ b/drivers/pinctrl/pinctrl-kendryte.c
@@ -735,6 +735,6 @@  U_BOOT_DRIVER(pinctrl_k210) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = k210_pc_ids,
 	.probe = k210_pc_probe,
-	.priv_auto_alloc_size = sizeof(struct k210_pc_priv),
+	.priv_auto	= sizeof(struct k210_pc_priv),
 	.ops = &k210_pc_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c
index 85521eabd40..e598797b721 100644
--- a/drivers/pinctrl/pinctrl-qe-io.c
+++ b/drivers/pinctrl/pinctrl-qe-io.c
@@ -246,7 +246,7 @@  U_BOOT_DRIVER(par_io_pinctrl) = {
 	.of_match = of_match_ptr(par_io_pinctrl_match),
 	.probe = par_io_pinctrl_probe,
 	.ofdata_to_platdata = qe_io_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct qe_io_platdata),
+	.platdata_auto	= sizeof(struct qe_io_platdata),
 	.ops = &par_io_pinctrl_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.flags	= DM_FLAG_PRE_RELOC,
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index d27f74248d0..77659774509 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -296,6 +296,6 @@  U_BOOT_DRIVER(sandbox_pinctrl) = {
 	.name = "sandbox_pinctrl",
 	.id = UCLASS_PINCTRL,
 	.of_match = sandbox_pinctrl_match,
-	.priv_auto_alloc_size = sizeof(struct sandbox_pinctrl_priv),
+	.priv_auto	= sizeof(struct sandbox_pinctrl_priv),
 	.ops = &sandbox_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 738f5bd6364..934be931668 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -191,6 +191,6 @@  U_BOOT_DRIVER(single_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = single_pinctrl_match,
 	.ops = &single_pinctrl_ops,
-	.platdata_auto_alloc_size = sizeof(struct single_pdata),
+	.platdata_auto	= sizeof(struct single_pdata),
 	.ofdata_to_platdata = single_ofdata_to_platdata,
 };
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 8e942a82802..c147863547d 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -316,6 +316,6 @@  U_BOOT_DRIVER(pinctrl_sti) = {
 	.of_match = sti_pinctrl_ids,
 	.ops = &sti_pinctrl_ops,
 	.probe = sti_pinctrl_probe,
-	.platdata_auto_alloc_size = sizeof(struct sti_pinctrl_platdata),
+	.platdata_auto	= sizeof(struct sti_pinctrl_platdata),
 	.ops = &sti_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index a62be44d2d8..e3df0bef01e 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -446,7 +446,7 @@  U_BOOT_DRIVER(stmfx_pinctrl) = {
 	.bind = stmfx_pinctrl_bind,
 	.probe = stmfx_pinctrl_probe,
 	.ops = &stmfx_pinctrl_ops,
-	.platdata_auto_alloc_size = sizeof(struct stmfx_pinctrl),
+	.platdata_auto	= sizeof(struct stmfx_pinctrl),
 };
 
 static int stmfx_chip_init(struct udevice *dev)
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 899c279975a..a19758d59d7 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -381,5 +381,5 @@  U_BOOT_DRIVER(pinctrl_pic32) = {
 	.ops		= &pic32_pinctrl_ops,
 	.probe		= pic32_pinctrl_probe,
 	.bind		= dm_scan_fdt_dev,
-	.priv_auto_alloc_size = sizeof(struct pic32_pinctrl_priv),
+	.priv_auto	= sizeof(struct pic32_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 262b2c3d7e5..591cd1a0ecc 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -500,5 +500,5 @@  U_BOOT_DRIVER(pinctrl_stm32) = {
 	.ops			= &stm32_pinctrl_ops,
 	.bind			= stm32_pinctrl_bind,
 	.probe			= stm32_pinctrl_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_pinctrl_priv),
+	.priv_auto	= sizeof(struct stm32_pinctrl_priv),
 };
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 9d7814a5f25..c3e6a24de35 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -142,6 +142,6 @@  U_BOOT_DRIVER(r7s72100_pfc) = {
 	.id		= UCLASS_PINCTRL,
 	.of_match	= r7s72100_pfc_match,
 	.probe		= r7s72100_pfc_probe,
-	.platdata_auto_alloc_size = sizeof(struct r7s72100_pfc_platdata),
+	.platdata_auto	= sizeof(struct r7s72100_pfc_platdata),
 	.ops		= &r7s72100_pfc_ops,
 };
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index fb811a95bc2..8bb7e16f944 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -990,7 +990,7 @@  U_BOOT_DRIVER(pinctrl_sh_pfc) = {
 	.name		= "sh_pfc_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= sh_pfc_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct sh_pfc_pinctrl_priv),
+	.priv_auto	= sizeof(struct sh_pfc_pinctrl_priv),
 	.ops		= &sh_pfc_pinctrl_ops,
 	.probe		= sh_pfc_pinctrl_probe,
 };
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index 617721a6264..6058d0f4c13 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -361,7 +361,7 @@  U_BOOT_DRIVER(pinctrl_px30) = {
 	.name		= "rockchip_px30_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= px30_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index d49e3007cea..9ccee465b0f 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -101,7 +101,7 @@  U_BOOT_DRIVER(pinctrl_rockchip) = {
 	.name		= "rk3036-pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3036_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index a175d6c07f1..85c2e611b6b 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -203,7 +203,7 @@  U_BOOT_DRIVER(pinctrl_rk3128) = {
 	.name		= "pinctrl_rk3128",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3128_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index 8f197110e5e..06d53e22d27 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -124,7 +124,7 @@  U_BOOT_DRIVER(rockchip_rk3188_pinctrl) = {
 	.name		= "rockchip_rk3188_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3188_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 85bc0ef0f31..fe386933c58 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -290,7 +290,7 @@  U_BOOT_DRIVER(pinctrl_rk3228) = {
 	.name		= "rockchip_rk3228_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3228_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index 011ca286ec9..fc2810248ba 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -246,7 +246,7 @@  U_BOOT_DRIVER(rockchip_rk3288_pinctrl) = {
 	.name		= "rockchip_rk3288_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3288_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index db2b10a6906..a9b87b74571 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -457,7 +457,7 @@  U_BOOT_DRIVER(pinctrl_rk3308) = {
 	.name		= "rockchip_rk3308_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3308_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 61eb9e0af0c..aa8bd76d6fb 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -321,7 +321,7 @@  U_BOOT_DRIVER(rockchip_rk3328_pinctrl) = {
 	.name		= "rockchip_rk3328_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3328_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index d8ccd4de576..18d3e3a9b5c 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -175,7 +175,7 @@  U_BOOT_DRIVER(rockchip_rk3368_pinctrl) = {
 	.name		= "rockchip_rk3368_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3368_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index d04c1afb090..0c1adc37946 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -315,7 +315,7 @@  U_BOOT_DRIVER(pinctrl_rk3399) = {
 	.name		= "rockchip_rk3399_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= rk3399_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops		= &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index 22334329ed4..d35425b5fa2 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -289,7 +289,7 @@  U_BOOT_DRIVER(pinctrl_rv1108) = {
 	.name           = "pinctrl_rv1108",
 	.id             = UCLASS_PINCTRL,
 	.of_match       = rv1108_pinctrl_ids,
-	.priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv),
+	.priv_auto	= sizeof(struct rockchip_pinctrl_priv),
 	.ops            = &rockchip_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.bind		= dm_scan_fdt_dev,
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index 5efaa2f66b0..a1a3cd73859 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -119,6 +119,6 @@  U_BOOT_DRIVER(uniphier_ld11_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_ld11_pinctrl_match),
 	.probe = uniphier_ld11_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index d3c5833c993..7a92a46c17f 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -152,6 +152,6 @@  U_BOOT_DRIVER(uniphier_ld20_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_ld20_pinctrl_match),
 	.probe = uniphier_ld20_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index bf1a9e9e989..d33e4d7dd25 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -142,6 +142,6 @@  U_BOOT_DRIVER(uniphier_ld4_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_ld4_pinctrl_match),
 	.probe = uniphier_ld4_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index f22c046804a..0e3eb131ecf 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -153,6 +153,6 @@  U_BOOT_DRIVER(uniphier_ld6b_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_ld6b_pinctrl_match),
 	.probe = uniphier_ld6b_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 8bae163a8e9..7ba2266092f 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -177,7 +177,7 @@  U_BOOT_DRIVER(uniphier_pro4_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_pro4_pinctrl_match),
 	.probe = uniphier_pro4_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 1f4931bcf0d..9ce2e2c270e 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -163,7 +163,7 @@  U_BOOT_DRIVER(uniphier_pro5_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_pro5_pinctrl_match),
 	.probe = uniphier_pro5_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 038a7dd7be0..e8c2018097c 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -157,6 +157,6 @@  U_BOOT_DRIVER(uniphier_pxs2_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_pxs2_pinctrl_match),
 	.probe = uniphier_pxs2_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
index 452d76d721d..1fc7bdb5c80 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
@@ -144,6 +144,6 @@  U_BOOT_DRIVER(uniphier_pxs3_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_pxs3_pinctrl_match),
 	.probe = uniphier_pxs3_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 1e38ba16f93..04c06fb280e 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -139,6 +139,6 @@  U_BOOT_DRIVER(uniphier_sld8_pinctrl) = {
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(uniphier_sld8_pinctrl_match),
 	.probe = uniphier_sld8_pinctrl_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
+	.priv_auto	= sizeof(struct uniphier_pinctrl_priv),
 	.ops = &uniphier_pinctrl_ops,
 };
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index 828963d8a09..7eeecc0523d 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -231,5 +231,5 @@  int pmc_ofdata_to_uc_platdata(struct udevice *dev)
 UCLASS_DRIVER(acpi_pmc) = {
 	.id		= UCLASS_ACPI_PMC,
 	.name		= "power-mgr",
-	.per_device_auto_alloc_size	= sizeof(struct acpi_pmc_upriv),
+	.per_device_auto	= sizeof(struct acpi_pmc_upriv),
 };
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index 5ed6fcca262..68724308723 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -235,8 +235,8 @@  U_BOOT_DRIVER(sandbox_pmc_emul_emul) = {
 	.of_match	= sandbox_pmc_emul_ids,
 	.ops		= &sandbox_pmc_emul_emul_ops,
 	.probe		= sandbox_pmc_probe,
-	.priv_auto_alloc_size = sizeof(struct pmc_emul_priv),
-	.platdata_auto_alloc_size = sizeof(struct pmc_emul_platdata),
+	.priv_auto	= sizeof(struct pmc_emul_priv),
+	.platdata_auto	= sizeof(struct pmc_emul_platdata),
 };
 
 static struct pci_device_id sandbox_pmc_emul_supported[] = {
diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c
index 48a6c663bd2..6cb7af10c20 100644
--- a/drivers/power/acpi_pmc/sandbox.c
+++ b/drivers/power/acpi_pmc/sandbox.c
@@ -94,5 +94,5 @@  U_BOOT_DRIVER(pmc_sandbox) = {
 	.of_match = sandbox_pmc_ids,
 	.probe = sandbox_pmc_probe,
 	.ops = &sandbox_pmc_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_pmc_priv),
+	.priv_auto	= sizeof(struct sandbox_pmc_priv),
 };
diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index a494bfa8c9d..6e720e0798c 100644
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -75,6 +75,6 @@  U_BOOT_DRIVER(bcm6328_power_domain) = {
 	.id = UCLASS_POWER_DOMAIN,
 	.of_match = bcm6328_power_domain_ids,
 	.ops = &bcm6328_power_domain_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6328_power_domain),
+	.priv_auto	= sizeof(struct bcm6328_power_domain),
 	.probe = bcm6328_power_domain_probe,
 };
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 889b65a47ff..33dd4cc2f96 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -377,8 +377,8 @@  U_BOOT_DRIVER(imx8_power_domain) = {
 	.bind = imx8_power_domain_bind,
 	.probe = imx8_power_domain_probe,
 	.ofdata_to_platdata = imx8_power_domain_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct imx8_power_domain_platdata),
-	.priv_auto_alloc_size = sizeof(struct imx8_power_domain_priv),
+	.platdata_auto	= sizeof(struct imx8_power_domain_platdata),
+	.priv_auto	= sizeof(struct imx8_power_domain_priv),
 	.ops = &imx8_power_domain_ops,
 	.flags	= DM_FLAG_DEFAULT_PD_CTRL_OFF,
 };
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index 0ef460df8c2..3736019c221 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -137,6 +137,6 @@  U_BOOT_DRIVER(imx8m_power_domain) = {
 	.bind = imx8m_power_domain_bind,
 	.probe = imx8m_power_domain_probe,
 	.ofdata_to_platdata = imx8m_power_domain_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct imx8m_power_domain_platdata),
+	.platdata_auto	= sizeof(struct imx8m_power_domain_platdata),
 	.ops = &imx8m_power_domain_ops,
 };
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 8349a9c1582..2e7ab671286 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -431,5 +431,5 @@  U_BOOT_DRIVER(meson_ee_pwrc) = {
 	.of_match = meson_ee_pwrc_ids,
 	.probe = meson_ee_pwrc_probe,
 	.ops = &meson_ee_pwrc_ops,
-	.priv_auto_alloc_size = sizeof(struct meson_ee_pwrc_priv),
+	.priv_auto	= sizeof(struct meson_ee_pwrc_priv),
 };
diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index a41b230448f..40947c66f31 100644
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -334,5 +334,5 @@  U_BOOT_DRIVER(meson_gx_pwrc_vpu) = {
 	.of_match = meson_gx_pwrc_vpu_ids,
 	.probe = meson_gx_pwrc_vpu_probe,
 	.ops = &meson_gx_pwrc_vpu_ops,
-	.priv_auto_alloc_size = sizeof(struct meson_gx_pwrc_vpu_priv),
+	.priv_auto	= sizeof(struct meson_gx_pwrc_vpu_priv),
 };
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index fae4749012b..ca2ded00efa 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -411,5 +411,5 @@  U_BOOT_DRIVER(mtk_power_domain) = {
 	.ops = &mtk_power_domain_ops,
 	.probe = mtk_power_domain_probe,
 	.of_match = mtk_power_domain_ids,
-	.priv_auto_alloc_size = sizeof(struct scp_domain),
+	.priv_auto	= sizeof(struct scp_domain),
 };
diff --git a/drivers/power/domain/sandbox-power-domain-test.c b/drivers/power/domain/sandbox-power-domain-test.c
index 2191a941469..1bf52f1d861 100644
--- a/drivers/power/domain/sandbox-power-domain-test.c
+++ b/drivers/power/domain/sandbox-power-domain-test.c
@@ -51,5 +51,5 @@  U_BOOT_DRIVER(sandbox_power_domain_test) = {
 	.name = "sandbox_power_domain_test",
 	.id = UCLASS_MISC,
 	.of_match = sandbox_power_domain_test_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_power_domain_test),
+	.priv_auto	= sizeof(struct sandbox_power_domain_test),
 };
diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 4d9a2006e66..04a071044f3 100644
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -88,7 +88,7 @@  U_BOOT_DRIVER(sandbox_power_domain) = {
 	.of_match = sandbox_power_domain_ids,
 	.bind = sandbox_power_domain_bind,
 	.probe = sandbox_power_domain_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_power_domain),
+	.priv_auto	= sizeof(struct sandbox_power_domain),
 	.ops = &sandbox_power_domain_ops,
 };
 
diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index 7ee121dfb26..f18e45617a1 100644
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -135,6 +135,6 @@  U_BOOT_DRIVER(ti_sci_pm_domains) = {
 	.id = UCLASS_POWER_DOMAIN,
 	.of_match = ti_sci_power_domain_of_match,
 	.probe = ti_sci_power_domain_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_power_domain_data),
+	.priv_auto	= sizeof(struct ti_sci_power_domain_data),
 	.ops = &ti_sci_power_domain_ops,
 };
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 404fe008fe6..633ad15b646 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -161,6 +161,6 @@  U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = {
 	.of_match	= sandbox_i2c_pmic_ids,
 	.ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata,
 	.probe		= sandbox_i2c_pmic_probe,
-	.platdata_auto_alloc_size = sizeof(struct sandbox_i2c_pmic_plat_data),
+	.platdata_auto	= sizeof(struct sandbox_i2c_pmic_plat_data),
 	.ops		= &sandbox_i2c_pmic_emul_ops,
 };
diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index ddc30604cff..5f4386d4adf 100644
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -82,5 +82,5 @@  U_BOOT_DRIVER(pmic_pm8916) = {
 	.bind = dm_scan_fdt_dev,
 	.probe = pm8916_probe,
 	.ops = &pm8916_ops,
-	.priv_auto_alloc_size = sizeof(struct pm8916_priv),
+	.priv_auto	= sizeof(struct pm8916_priv),
 };
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index 7770171917d..79166b8bbcd 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -196,5 +196,5 @@  UCLASS_DRIVER(pmic) = {
 	.id		= UCLASS_PMIC,
 	.name		= "pmic",
 	.pre_probe	= pmic_pre_probe,
-	.per_device_auto_alloc_size = sizeof(struct uc_pmic_priv),
+	.per_device_auto	= sizeof(struct uc_pmic_priv),
 };
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 148ee29cca0..2f547a314d9 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -190,7 +190,7 @@  U_BOOT_DRIVER(rockchip_rk805) = {
 #if CONFIG_IS_ENABLED(PMIC_CHILDREN)
 	.bind = rk8xx_bind,
 #endif
-	.priv_auto_alloc_size   = sizeof(struct rk8xx_priv),
+	.priv_auto	  = sizeof(struct rk8xx_priv),
 	.probe = rk8xx_probe,
 	.ops = &rk8xx_ops,
 };
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 931d753e344..ba32f591902 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -466,5 +466,5 @@  U_BOOT_DRIVER(bd71837_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &bd71837_regulator_ops,
 	.probe = bd71837_regulator_probe,
-	.platdata_auto_alloc_size = sizeof(struct bd71837_platdata),
+	.platdata_auto	= sizeof(struct bd71837_platdata),
 };
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index 5055e39cb79..4ff7f396771 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -366,7 +366,7 @@  U_BOOT_DRIVER(da9063_ldo) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &da9063_ldo_ops,
 	.probe = da9063_ldo_probe,
-	.priv_auto_alloc_size = sizeof(struct da9063_priv),
+	.priv_auto	= sizeof(struct da9063_priv),
 };
 
 static const struct dm_regulator_ops da9063_buck_ops = {
@@ -385,5 +385,5 @@  U_BOOT_DRIVER(da9063_buck) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &da9063_buck_ops,
 	.probe = da9063_buck_probe,
-	.priv_auto_alloc_size = sizeof(struct da9063_priv),
+	.priv_auto	= sizeof(struct da9063_priv),
 };
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index b407f555fe3..70aeef710b4 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -239,7 +239,7 @@  U_BOOT_DRIVER(fan53555_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &fan53555_regulator_ops,
 	.ofdata_to_platdata = fan53555_regulator_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct fan53555_platdata),
-	.priv_auto_alloc_size = sizeof(struct fan53555_priv),
+	.platdata_auto	= sizeof(struct fan53555_platdata),
+	.priv_auto	= sizeof(struct fan53555_priv),
 	.probe = fan53555_probe,
 };
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 2fa6c7e6b29..d887c87ed8c 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -89,5 +89,5 @@  U_BOOT_DRIVER(regulator_fixed) = {
 	.ops = &fixed_regulator_ops,
 	.of_match = fixed_regulator_ids,
 	.ofdata_to_platdata = fixed_regulator_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct regulator_common_platdata),
+	.platdata_auto	= sizeof(struct regulator_common_platdata),
 };
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 28c9e222e2b..d5998f1d2a2 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -155,5 +155,5 @@  U_BOOT_DRIVER(gpio_regulator) = {
 	.ops = &gpio_regulator_ops,
 	.of_match = gpio_regulator_ids,
 	.ofdata_to_platdata = gpio_regulator_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct gpio_regulator_platdata),
+	.platdata_auto	= sizeof(struct gpio_regulator_platdata),
 };
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 28a9a1470b1..dc944c9c1d9 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -130,7 +130,7 @@  U_BOOT_DRIVER(pbias_pmic) = {
 	.bind = pbias_bind,
 	.ops = &pbias_ops,
 	.ofdata_to_platdata = pbias_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct pbias_priv),
+	.priv_auto	= sizeof(struct pbias_priv),
 };
 
 static const struct pbias_reg_info pbias_mmc_omap2430 = {
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index b56843046f2..8dc517fe410 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -572,5 +572,5 @@  U_BOOT_DRIVER(pfuze100_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &pfuze100_regulator_ops,
 	.probe = pfuze100_regulator_probe,
-	.platdata_auto_alloc_size = sizeof(struct pfuze100_regulator_platdata),
+	.platdata_auto	= sizeof(struct pfuze100_regulator_platdata),
 };
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index f8706227058..ebd09e778c7 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -155,5 +155,5 @@  U_BOOT_DRIVER(pwm_regulator) = {
 	.probe = pwm_regulator_probe,
 	.of_match = pwm_regulator_ids,
 	.ofdata_to_platdata	= pwm_regulator_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct pwm_regulator_info),
+	.priv_auto	= sizeof(struct pwm_regulator_info),
 };
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index da679a572c2..6192406f6a2 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -500,6 +500,6 @@  UCLASS_DRIVER(regulator) = {
 	.name		= "regulator",
 	.post_bind	= regulator_post_bind,
 	.pre_probe	= regulator_pre_probe,
-	.per_device_platdata_auto_alloc_size =
+	.per_device_platdata_auto	=
 				sizeof(struct dm_regulator_uclass_platdata),
 };
diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c
index 92136961c2e..c2c5770fa57 100644
--- a/drivers/power/regulator/stm32-vrefbuf.c
+++ b/drivers/power/regulator/stm32-vrefbuf.c
@@ -165,5 +165,5 @@  U_BOOT_DRIVER(stm32_vrefbuf) = {
 	.of_match = stm32_vrefbuf_ids,
 	.probe = stm32_vrefbuf_probe,
 	.ops = &stm32_vrefbuf_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_vrefbuf),
+	.priv_auto	= sizeof(struct stm32_vrefbuf),
 };
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index ce54495490d..57556662f35 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -119,6 +119,6 @@  U_BOOT_DRIVER(tps62360_regulator) = {
 	.id = UCLASS_REGULATOR,
 	.ops = &tps62360_regulator_ops,
 	.of_match = tps62360_regulator_ids,
-	.platdata_auto_alloc_size = sizeof(struct tps62360_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps62360_regulator_pdata),
 	.probe = tps62360_regulator_probe,
 };
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 171afd34a5f..467ff3f1355 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -424,7 +424,7 @@  U_BOOT_DRIVER(tps65910_boost) = {
 	.name = TPS65910_BOOST_DRIVER,
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_boost_ops,
-	.platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps65910_regulator_pdata),
 	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
 };
 
@@ -439,7 +439,7 @@  U_BOOT_DRIVER(tps65910_buck) = {
 	.name = TPS65910_BUCK_DRIVER,
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_buck_ops,
-	.platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps65910_regulator_pdata),
 	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
 };
 
@@ -454,6 +454,6 @@  U_BOOT_DRIVER(tps65910_ldo) = {
 	.name = TPS65910_LDO_DRIVER,
 	.id = UCLASS_REGULATOR,
 	.ops = &tps65910_ldo_ops,
-	.platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata),
+	.platdata_auto	= sizeof(struct tps65910_regulator_pdata),
 	.ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata,
 };
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index e55fcceafd7..70fbdf89bd0 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -114,5 +114,5 @@  U_BOOT_DRIVER(exynos_pwm) = {
 	.ops	= &exynos_pwm_ops,
 	.probe	= exynos_pwm_probe,
 	.ofdata_to_platdata	= exynos_pwm_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct exynos_pwm_priv),
+	.priv_auto	= sizeof(struct exynos_pwm_priv),
 };
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 77a1907fd3b..0b8e82b6fae 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -158,6 +158,6 @@  U_BOOT_DRIVER(imx_pwm) = {
 	.ops	= &imx_pwm_ops,
 	.ofdata_to_platdata	= imx_pwm_ofdata_to_platdata,
 	.probe		= imx_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct imx_pwm_priv),
+	.priv_auto	= sizeof(struct imx_pwm_priv),
 };
 #endif
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index cafb571f16f..e538e27e136 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -524,5 +524,5 @@  U_BOOT_DRIVER(meson_pwm) = {
 	.ops	= &meson_pwm_ops,
 	.ofdata_to_platdata = meson_pwm_ofdata_to_platdata,
 	.probe	 = meson_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct meson_pwm),
+	.priv_auto	= sizeof(struct meson_pwm),
 };
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 7bd82518d67..aee1d825a0c 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -184,5 +184,5 @@  U_BOOT_DRIVER(mtk_pwm) = {
 	.of_match = mtk_pwm_ids,
 	.ops = &mtk_pwm_ops,
 	.probe = mtk_pwm_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_pwm_priv),
+	.priv_auto	= sizeof(struct mtk_pwm_priv),
 };
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 77bc659fefe..4731e4a1858 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -168,5 +168,5 @@  U_BOOT_DRIVER(pwm_sifive) = {
 	.ops	= &pwm_sifive_ops,
 	.ofdata_to_platdata     = pwm_sifive_ofdata_to_platdata,
 	.probe		= pwm_sifive_probe,
-	.priv_auto_alloc_size	= sizeof(struct pwm_sifive_priv),
+	.priv_auto	= sizeof(struct pwm_sifive_priv),
 };
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 911da1d4261..ccd23d88849 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -215,5 +215,5 @@  U_BOOT_DRIVER(rk_pwm) = {
 	.ops	= &rk_pwm_ops,
 	.ofdata_to_platdata	= rk_pwm_ofdata_to_platdata,
 	.probe		= rk_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct rk_pwm_priv),
+	.priv_auto	= sizeof(struct rk_pwm_priv),
 };
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 28988187e03..318dce7c149 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -109,5 +109,5 @@  U_BOOT_DRIVER(warm_pwm_sandbox) = {
 	.id		= UCLASS_PWM,
 	.of_match	= sandbox_pwm_ids,
 	.ops		= &sandbox_pwm_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_pwm_priv),
+	.priv_auto	= sizeof(struct sandbox_pwm_priv),
 };
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index e2ae1a80091..9a35fe02def 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -181,5 +181,5 @@  U_BOOT_DRIVER(sunxi_pwm) = {
 	.ops	= &sunxi_pwm_ops,
 	.ofdata_to_platdata	= sunxi_pwm_ofdata_to_platdata,
 	.probe		= sunxi_pwm_probe,
-	.priv_auto_alloc_size	= sizeof(struct sunxi_pwm_priv),
+	.priv_auto	= sizeof(struct sunxi_pwm_priv),
 };
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 5e98d0fc2c7..29c9ce366c9 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -79,5 +79,5 @@  U_BOOT_DRIVER(tegra_pwm) = {
 	.of_match = tegra_pwm_ids,
 	.ops	= &tegra_pwm_ops,
 	.ofdata_to_platdata	= tegra_pwm_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct tegra_pwm_priv),
+	.priv_auto	= sizeof(struct tegra_pwm_priv),
 };
diff --git a/drivers/ram/aspeed/sdram_ast2500.c b/drivers/ram/aspeed/sdram_ast2500.c
index 9f4304cb663..e4d01d848ee 100644
--- a/drivers/ram/aspeed/sdram_ast2500.c
+++ b/drivers/ram/aspeed/sdram_ast2500.c
@@ -435,5 +435,5 @@  U_BOOT_DRIVER(sdrammc_ast2500) = {
 	.ops = &ast2500_sdrammc_ops,
 	.ofdata_to_platdata = ast2500_sdrammc_ofdata_to_platdata,
 	.probe = ast2500_sdrammc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 };
diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c
index 8f953e79afd..98045248ecf 100644
--- a/drivers/ram/bmips_ram.c
+++ b/drivers/ram/bmips_ram.c
@@ -172,6 +172,6 @@  U_BOOT_DRIVER(bmips_ram) = {
 	.id = UCLASS_RAM,
 	.of_match = bmips_ram_ids,
 	.probe = bmips_ram_probe,
-	.priv_auto_alloc_size = sizeof(struct bmips_ram_priv),
+	.priv_auto	= sizeof(struct bmips_ram_priv),
 	.ops = &bmips_ram_ops,
 };
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index b6ee02d2279..da5eb8255ba 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -441,5 +441,5 @@  U_BOOT_DRIVER(imxrt_semc) = {
 	.ops = &imxrt_semc_ops,
 	.ofdata_to_platdata = imxrt_semc_ofdata_to_platdata,
 	.probe = imxrt_semc_probe,
-	.platdata_auto_alloc_size = sizeof(struct imxrt_sdram_params),
+	.platdata_auto	= sizeof(struct imxrt_sdram_params),
 };
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index 21e5a655295..4ec12bf42eb 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -1082,5 +1082,5 @@  U_BOOT_DRIVER(am654_ddrss) = {
 	.of_match = am654_ddrss_ids,
 	.ops = &am654_ddrss_ops,
 	.probe = am654_ddrss_probe,
-	.priv_auto_alloc_size = sizeof(struct am654_ddrss_desc),
+	.priv_auto	= sizeof(struct am654_ddrss_desc),
 };
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index d647a8a2090..9fb1eeea454 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -371,5 +371,5 @@  U_BOOT_DRIVER(j721e_ddrss) = {
 	.of_match = j721e_ddrss_ids,
 	.ops = &j721e_ddrss_ops,
 	.probe = j721e_ddrss_probe,
-	.priv_auto_alloc_size = sizeof(struct j721e_ddrss_desc),
+	.priv_auto	= sizeof(struct j721e_ddrss_desc),
 };
diff --git a/drivers/ram/mediatek/ddr3-mt7629.c b/drivers/ram/mediatek/ddr3-mt7629.c
index b3a68cb0787..d12a3b4f436 100644
--- a/drivers/ram/mediatek/ddr3-mt7629.c
+++ b/drivers/ram/mediatek/ddr3-mt7629.c
@@ -764,5 +764,5 @@  U_BOOT_DRIVER(mediatek_ddr3) = {
 	.of_match = mtk_ddr3_ids,
 	.ops      = &mtk_ddr3_ops,
 	.probe    = mtk_ddr3_probe,
-	.priv_auto_alloc_size = sizeof(struct mtk_ddr3_priv),
+	.priv_auto	= sizeof(struct mtk_ddr3_priv),
 };
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index a226bac2cc3..87294430bf9 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -1095,5 +1095,5 @@  U_BOOT_DRIVER(mpc83xx_sdram) = {
 	.ops = &mpc83xx_sdram_ops,
 	.ofdata_to_platdata = mpc83xx_sdram_ofdata_to_platdata,
 	.probe = mpc83xx_sdram_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_sdram_priv),
+	.priv_auto	= sizeof(struct mpc83xx_sdram_priv),
 };
diff --git a/drivers/ram/octeon/octeon_ddr.c b/drivers/ram/octeon/octeon_ddr.c
index 757436b9d37..6225864fd1b 100644
--- a/drivers/ram/octeon/octeon_ddr.c
+++ b/drivers/ram/octeon/octeon_ddr.c
@@ -2724,5 +2724,5 @@  U_BOOT_DRIVER(octeon_ddr) = {
 	.of_match = octeon_ids,
 	.ops = &octeon_ops,
 	.probe = octeon_ddr_probe,
-	.platdata_auto_alloc_size = sizeof(struct ddr_priv),
+	.platdata_auto	= sizeof(struct ddr_priv),
 };
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 4fa632152fd..bc9b5dfbe3b 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -998,9 +998,9 @@  U_BOOT_DRIVER(rockchip_rk3368_dmc) = {
 	.of_match = rk3368_dmc_ids,
 	.ops = &rk3368_dmc_ops,
 	.probe = rk3368_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 	.ofdata_to_platdata = rk3368_dmc_ofdata_to_platdata,
 	.probe = rk3368_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
-	.platdata_auto_alloc_size = sizeof(struct rk3368_sdram_params),
+	.priv_auto	= sizeof(struct dram_info),
+	.platdata_auto	= sizeof(struct rk3368_sdram_params),
 };
diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index 2f1f6e9c0c4..c024a0cd633 100644
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -757,6 +757,6 @@  U_BOOT_DRIVER(dmc_px30) = {
 	.of_match = px30_dmc_ids,
 	.ops = &px30_dmc_ops,
 	.probe = px30_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 };
 #endif /* CONFIG_TPL_BUILD */
diff --git a/drivers/ram/rockchip/sdram_rk3128.c b/drivers/ram/rockchip/sdram_rk3128.c
index 0162955aae0..16cfbf947bd 100644
--- a/drivers/ram/rockchip/sdram_rk3128.c
+++ b/drivers/ram/rockchip/sdram_rk3128.c
@@ -54,5 +54,5 @@  U_BOOT_DRIVER(dmc_rk3128) = {
 	.of_match = rk3128_dmc_ids,
 	.ops = &rk3128_dmc_ops,
 	.probe = rk3128_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 };
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index 06f9eba1a5b..38db1119eef 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -954,8 +954,8 @@  U_BOOT_DRIVER(rockchip_rk3188_dmc) = {
 	.ofdata_to_platdata = rk3188_dmc_ofdata_to_platdata,
 #endif
 	.probe = rk3188_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 #ifdef CONFIG_SPL_BUILD
-	.platdata_auto_alloc_size = sizeof(struct rk3188_sdram_params),
+	.platdata_auto	= sizeof(struct rk3188_sdram_params),
 #endif
 };
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 094693ce247..9b39332a32f 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -847,9 +847,9 @@  U_BOOT_DRIVER(dmc_rk322x) = {
 	.ofdata_to_platdata = rk322x_dmc_ofdata_to_platdata,
 #endif
 	.probe = rk322x_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 #ifdef CONFIG_TPL_BUILD
-	.platdata_auto_alloc_size = sizeof(struct rk322x_sdram_params),
+	.platdata_auto	= sizeof(struct rk322x_sdram_params),
 #endif
 };
 
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 26e8d059b5d..a909502207a 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -1123,9 +1123,9 @@  U_BOOT_DRIVER(rockchip_rk3288_dmc) = {
 	.ofdata_to_platdata = rk3288_dmc_ofdata_to_platdata,
 #endif
 	.probe = rk3288_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 #if defined(CONFIG_TPL_BUILD) || \
 	(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
-	.platdata_auto_alloc_size = sizeof(struct rk3288_sdram_params),
+	.platdata_auto	= sizeof(struct rk3288_sdram_params),
 #endif
 };
diff --git a/drivers/ram/rockchip/sdram_rk3308.c b/drivers/ram/rockchip/sdram_rk3308.c
index 310df79123c..44d7d8a0d9b 100644
--- a/drivers/ram/rockchip/sdram_rk3308.c
+++ b/drivers/ram/rockchip/sdram_rk3308.c
@@ -51,5 +51,5 @@  U_BOOT_DRIVER(dmc_rk3308) = {
 	.of_match = rk3308_dmc_ids,
 	.ops = &rk3308_dmc_ops,
 	.probe = rk3308_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 };
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 98c7feb6cfa..961c95856a0 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -615,8 +615,8 @@  U_BOOT_DRIVER(rockchip_rk3328_dmc) = {
 	.ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata,
 #endif
 	.probe = rk3328_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 #ifdef CONFIG_TPL_BUILD
-	.platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat),
+	.platdata_auto	= sizeof(struct rockchip_dmc_plat),
 #endif
 };
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 530c8a2f401..b36c98250eb 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -3178,9 +3178,9 @@  U_BOOT_DRIVER(dmc_rk3399) = {
 	.ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata,
 #endif
 	.probe = rk3399_dmc_probe,
-	.priv_auto_alloc_size = sizeof(struct dram_info),
+	.priv_auto	= sizeof(struct dram_info),
 #if defined(CONFIG_TPL_BUILD) || \
 	(!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
-	.platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat),
+	.platdata_auto	= sizeof(struct rockchip_dmc_plat),
 #endif
 };
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 60d4945f848..f9810936119 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -402,8 +402,8 @@  U_BOOT_DRIVER(fu540_ddr) = {
 	.of_match = fu540_ddr_ids,
 	.ops = &fu540_ddr_ops,
 	.probe = fu540_ddr_probe,
-	.priv_auto_alloc_size = sizeof(struct fu540_ddr_info),
+	.priv_auto	= sizeof(struct fu540_ddr_info),
 #if defined(CONFIG_SPL_BUILD)
-	.platdata_auto_alloc_size = sizeof(struct sifive_dmc_plat),
+	.platdata_auto	= sizeof(struct sifive_dmc_plat),
 #endif
 };
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 3fddf4df961..82c7e955224 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -409,5 +409,5 @@  U_BOOT_DRIVER(stm32_fmc) = {
 	.ops = &stm32_fmc_ops,
 	.ofdata_to_platdata = stm32_fmc_ofdata_to_platdata,
 	.probe = stm32_fmc_probe,
-	.platdata_auto_alloc_size = sizeof(struct stm32_sdram_params),
+	.platdata_auto	= sizeof(struct stm32_sdram_params),
 };
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 9022679703b..0b6d20f5667 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -235,5 +235,5 @@  U_BOOT_DRIVER(ddr_stm32mp1) = {
 	.of_match = stm32mp1_ddr_ids,
 	.ops = &stm32mp1_ddr_ops,
 	.probe = stm32mp1_ddr_probe,
-	.priv_auto_alloc_size = sizeof(struct ddr_info),
+	.priv_auto	= sizeof(struct ddr_info),
 };
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 702d98d1a85..89cb90207dc 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -322,5 +322,5 @@  U_BOOT_DRIVER(k3_sysctrler) = {
 	.id = UCLASS_REMOTEPROC,
 	.ops = &k3_sysctrler_ops,
 	.probe = k3_sysctrler_probe,
-	.priv_auto_alloc_size = sizeof(struct k3_sysctrler_privdata),
+	.priv_auto	= sizeof(struct k3_sysctrler_privdata),
 };
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 9640a81e534..41ac001d96c 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -210,7 +210,7 @@  UCLASS_DRIVER(rproc) = {
 	.flags = DM_UC_FLAG_SEQ_ALIAS,
 	.pre_probe = rproc_pre_probe,
 	.post_probe = rproc_post_probe,
-	.per_device_platdata_auto_alloc_size =
+	.per_device_platdata_auto	=
 		sizeof(struct dm_rproc_uclass_pdata),
 };
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 2b58b27947c..7126888698c 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -343,7 +343,7 @@  U_BOOT_DRIVER(sandbox_testproc) = {
 	.id = UCLASS_REMOTEPROC,
 	.ops = &sandbox_testproc_ops,
 	.probe = sandbox_testproc_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_test_devdata),
+	.priv_auto	= sizeof(struct sandbox_test_devdata),
 };
 
 /* TODO(nm@ti.com): Remove this along with non-DT support */
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index dc87cb794e4..ec7694dda9e 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -222,5 +222,5 @@  U_BOOT_DRIVER(stm32_copro) = {
 	.id = UCLASS_REMOTEPROC,
 	.ops = &stm32_copro_ops,
 	.probe = stm32_copro_probe,
-	.priv_auto_alloc_size = sizeof(struct stm32_copro_privdata),
+	.priv_auto	= sizeof(struct stm32_copro_privdata),
 };
diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c
index 28c6ddb6919..1041f3805fa 100644
--- a/drivers/remoteproc/ti_k3_arm64_rproc.c
+++ b/drivers/remoteproc/ti_k3_arm64_rproc.c
@@ -226,6 +226,6 @@  U_BOOT_DRIVER(k3_arm64) = {
 	.id = UCLASS_REMOTEPROC,
 	.ops = &k3_arm64_ops,
 	.probe = k3_arm64_probe,
-	.priv_auto_alloc_size = sizeof(struct k3_arm64_privdata),
+	.priv_auto	= sizeof(struct k3_arm64_privdata),
 	.flags = DM_FLAG_DEFAULT_PD_CTRL_OFF,
 };
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 3361555c536..1a2e9dd1f58 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -456,5 +456,5 @@  U_BOOT_DRIVER(k3_dsp) = {
 	.ops = &k3_dsp_ops,
 	.probe = k3_dsp_probe,
 	.remove = k3_dsp_remove,
-	.priv_auto_alloc_size = sizeof(struct k3_dsp_privdata),
+	.priv_auto	= sizeof(struct k3_dsp_privdata),
 };
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index 9332a63d219..10bc4e99f0c 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -866,7 +866,7 @@  U_BOOT_DRIVER(k3_r5f_rproc) = {
 	.ops = &k3_r5f_rproc_ops,
 	.probe = k3_r5f_probe,
 	.remove = k3_r5f_remove,
-	.priv_auto_alloc_size = sizeof(struct k3_r5f_core),
+	.priv_auto	= sizeof(struct k3_r5f_core),
 };
 
 static int k3_r5f_cluster_probe(struct udevice *dev)
@@ -901,6 +901,6 @@  U_BOOT_DRIVER(k3_r5fss) = {
 	.of_match = k3_r5fss_ids,
 	.id = UCLASS_MISC,
 	.probe = k3_r5f_cluster_probe,
-	.priv_auto_alloc_size = sizeof(struct k3_r5f_cluster),
+	.priv_auto	= sizeof(struct k3_r5f_cluster),
 	.flags = DM_FLAG_DEFAULT_PD_CTRL_OFF,
 };
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 350450d1fb4..14bb2d95ba6 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -177,5 +177,5 @@  U_BOOT_DRIVER(ti_powerproc) = {
 	.id = UCLASS_REMOTEPROC,
 	.ops = &ti_powerproc_ops,
 	.probe = ti_powerproc_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_powerproc_privdata),
+	.priv_auto	= sizeof(struct ti_powerproc_privdata),
 };
diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c
index e7b5c7decab..a229d490f36 100644
--- a/drivers/reset/reset-ast2500.c
+++ b/drivers/reset/reset-ast2500.c
@@ -105,5 +105,5 @@  U_BOOT_DRIVER(ast2500_reset) = {
 	.of_match = ast2500_reset_ids,
 	.probe = ast2500_reset_probe,
 	.ops = &ast2500_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct ast2500_reset_priv),
+	.priv_auto	= sizeof(struct ast2500_reset_priv),
 };
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 156703e0843..f69189822bf 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -84,5 +84,5 @@  U_BOOT_DRIVER(bcm6345_reset) = {
 	.of_match = bcm6345_reset_ids,
 	.ops = &bcm6345_reset_reset_ops,
 	.probe = bcm6345_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_reset_priv),
+	.priv_auto	= sizeof(struct bcm6345_reset_priv),
 };
diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 139bc5d73e0..3f9da8cc8d3 100644
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -102,5 +102,5 @@  U_BOOT_DRIVER(hisi_reset) = {
 	.of_match = hisi_reset_ids,
 	.ops = &hisi_reset_reset_ops,
 	.probe = hisi_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct hisi_reset_priv),
+	.priv_auto	= sizeof(struct hisi_reset_priv),
 };
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 0c8f276293d..8318d0a20b4 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -114,5 +114,5 @@  U_BOOT_DRIVER(hsdk_reset) = {
 	.of_match = hsdk_reset_dt_match,
 	.ops = &hsdk_reset_ops,
 	.probe = hsdk_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct hsdk_rst),
+	.priv_auto	= sizeof(struct hsdk_rst),
 };
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 96916b644ad..e5085ae17c4 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -312,5 +312,5 @@  U_BOOT_DRIVER(imx7_reset) = {
 	.of_match = imx7_reset_ids,
 	.ops = &imx7_reset_reset_ops,
 	.probe = imx7_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct imx7_reset_priv),
+	.priv_auto	= sizeof(struct imx7_reset_priv),
 };
diff --git a/drivers/reset/reset-ipq4019.c b/drivers/reset/reset-ipq4019.c
index f216db4ce5c..15858f3cb1e 100644
--- a/drivers/reset/reset-ipq4019.c
+++ b/drivers/reset/reset-ipq4019.c
@@ -169,5 +169,5 @@  U_BOOT_DRIVER(ipq4019_reset) = {
 	.of_match = ipq4019_reset_ids,
 	.ops = &ipq4019_reset_ops,
 	.probe = ipq4019_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct ipq4019_reset_priv),
+	.priv_auto	= sizeof(struct ipq4019_reset_priv),
 };
diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 97d3d575927..b97a21f6717 100644
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -102,5 +102,5 @@  U_BOOT_DRIVER(mediatek_reset) = {
 	.id = UCLASS_RESET,
 	.probe = mediatek_reset_probe,
 	.ops = &mediatek_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct mediatek_reset_priv),
+	.priv_auto	= sizeof(struct mediatek_reset_priv),
 };
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 4e3327898e2..d4e0745d0e0 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -89,5 +89,5 @@  U_BOOT_DRIVER(meson_reset) = {
 	.of_match = meson_reset_ids,
 	.probe = meson_reset_probe,
 	.ops = &meson_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct meson_reset_priv),
+	.priv_auto	= sizeof(struct meson_reset_priv),
 };
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index bc20e3335c5..18a4ecad4f0 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -80,6 +80,6 @@  U_BOOT_DRIVER(mtmips_reset) = {
 	.of_match = mtmips_reset_ids,
 	.ofdata_to_platdata = mtmips_reset_ofdata_to_platdata,
 	.probe = mtmips_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct mtmips_reset_priv),
+	.priv_auto	= sizeof(struct mtmips_reset_priv),
 	.ops = &mtmips_reset_ops,
 };
diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 80925556508..e5e9918c0c1 100644
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -131,5 +131,5 @@  U_BOOT_DRIVER(rockchip_reset) = {
 	.id = UCLASS_RESET,
 	.probe = rockchip_reset_probe,
 	.ops = &rockchip_reset_ops,
-	.priv_auto_alloc_size = sizeof(struct rockchip_reset_priv),
+	.priv_auto	= sizeof(struct rockchip_reset_priv),
 };
diff --git a/drivers/reset/reset-sifive.c b/drivers/reset/reset-sifive.c
index 527757f8533..f6110d85f9f 100644
--- a/drivers/reset/reset-sifive.c
+++ b/drivers/reset/reset-sifive.c
@@ -114,5 +114,5 @@  U_BOOT_DRIVER(sifive_reset) = {
 	.id		= UCLASS_RESET,
 	.ops		= &sifive_reset_ops,
 	.probe		= sifive_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sifive_reset_priv),
+	.priv_auto	= sizeof(struct sifive_reset_priv),
 };
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 1849db4da9b..c64c9b5917c 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -166,7 +166,7 @@  U_BOOT_DRIVER(socfpga_reset) = {
 	.of_match = socfpga_reset_match,
 	.bind = socfpga_reset_bind,
 	.probe = socfpga_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct socfpga_reset_data),
+	.priv_auto	= sizeof(struct socfpga_reset_data),
 	.ops = &socfpga_reset_ops,
 	.remove = socfpga_reset_remove,
 	.flags	= DM_FLAG_OS_PREPARE,
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 05f7f599ce3..1db321ce1fd 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -123,5 +123,5 @@  U_BOOT_DRIVER(sunxi_reset) = {
 	.id		= UCLASS_RESET,
 	.ops		= &sunxi_reset_ops,
 	.probe		= sunxi_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sunxi_reset_priv),
+	.priv_auto	= sizeof(struct sunxi_reset_priv),
 };
diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c
index 8520227d551..ff387ab6b22 100644
--- a/drivers/reset/reset-syscon.c
+++ b/drivers/reset/reset-syscon.c
@@ -76,6 +76,6 @@  U_BOOT_DRIVER(syscon_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = syscon_reset_ids,
 	.probe = syscon_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct syscon_reset_priv),
+	.priv_auto	= sizeof(struct syscon_reset_priv),
 	.ops = &syscon_reset_ops,
 };
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index 95cd3885876..d8510a4abb2 100644
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -205,6 +205,6 @@  U_BOOT_DRIVER(ti_sci_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = ti_sci_reset_of_match,
 	.probe = ti_sci_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_reset_data),
+	.priv_auto	= sizeof(struct ti_sci_reset_data),
 	.ops = &ti_sci_reset_ops,
 };
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index fe1bd5541bd..2694d130b64 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -372,6 +372,6 @@  U_BOOT_DRIVER(uniphier_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = uniphier_reset_match,
 	.probe = uniphier_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_reset_priv),
+	.priv_auto	= sizeof(struct uniphier_reset_priv),
 	.ops = &uniphier_reset_ops,
 };
diff --git a/drivers/reset/sandbox-reset-test.c b/drivers/reset/sandbox-reset-test.c
index 10e02f10362..51b79810c89 100644
--- a/drivers/reset/sandbox-reset-test.c
+++ b/drivers/reset/sandbox-reset-test.c
@@ -120,5 +120,5 @@  U_BOOT_DRIVER(sandbox_reset_test) = {
 	.name = "sandbox_reset_test",
 	.id = UCLASS_MISC,
 	.of_match = sandbox_reset_test_ids,
-	.priv_auto_alloc_size = sizeof(struct sandbox_reset_test),
+	.priv_auto	= sizeof(struct sandbox_reset_test),
 };
diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index 08008d875ab..97b1b92e4a6 100644
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -99,7 +99,7 @@  U_BOOT_DRIVER(sandbox_reset) = {
 	.of_match = sandbox_reset_ids,
 	.bind = sandbox_reset_bind,
 	.probe = sandbox_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_reset),
+	.priv_auto	= sizeof(struct sandbox_reset),
 	.ops = &sandbox_reset_reset_ops,
 };
 
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index ac3a99f9bff..b03638d34d5 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -336,6 +336,6 @@  U_BOOT_DRIVER(sti_reset) = {
 	.id = UCLASS_RESET,
 	.of_match = sti_reset_ids,
 	.probe = sti_reset_probe,
-	.priv_auto_alloc_size = sizeof(struct sti_reset),
+	.priv_auto	= sizeof(struct sti_reset),
 	.ops = &sti_reset_ops,
 };
diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index 20c36a99eb3..4a05ab65aeb 100644
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -100,6 +100,6 @@  U_BOOT_DRIVER(stm32_rcc_reset) = {
 	.name			= "stm32_rcc_reset",
 	.id			= UCLASS_RESET,
 	.probe			= stm32_reset_probe,
-	.priv_auto_alloc_size	= sizeof(struct stm32_reset_priv),
+	.priv_auto	= sizeof(struct stm32_reset_priv),
 	.ops			= &stm32_reset_ops,
 };
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 57a5a702a23..fedde65395a 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -116,6 +116,6 @@  U_BOOT_DRIVER(meson_rng) = {
 	.ops = &meson_rng_ops,
 	.probe = meson_rng_probe,
 	.remove = meson_rng_remove,
-	.platdata_auto_alloc_size = sizeof(struct meson_rng_platdata),
+	.platdata_auto	= sizeof(struct meson_rng_platdata),
 	.ofdata_to_platdata = meson_rng_ofdata_to_platdata,
 };
diff --git a/drivers/rng/msm_rng.c b/drivers/rng/msm_rng.c
index d51119303a6..29e7354ece5 100644
--- a/drivers/rng/msm_rng.c
+++ b/drivers/rng/msm_rng.c
@@ -139,5 +139,5 @@  U_BOOT_DRIVER(msm_rng) = {
 	.ops = &msm_rng_ops,
 	.probe = msm_rng_probe,
 	.remove = msm_rng_remove,
-	.priv_auto_alloc_size = sizeof(struct msm_rng_priv),
+	.priv_auto	= sizeof(struct msm_rng_priv),
 };
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index c6a834b67c5..7c4363f7992 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -221,5 +221,5 @@  U_BOOT_DRIVER(rockchip_rng) = {
 	.ops = &rockchip_rng_ops,
 	.probe = rockchip_rng_probe,
 	.ofdata_to_platdata = rockchip_rng_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct rk_rng_platdata),
+	.priv_auto	= sizeof(struct rk_rng_platdata),
 };
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index c1bae180f77..4eed1de8adc 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -160,6 +160,6 @@  U_BOOT_DRIVER(stm32_rng) = {
 	.ops = &stm32_rng_ops,
 	.probe = stm32_rng_probe,
 	.remove = stm32_rng_remove,
-	.platdata_auto_alloc_size = sizeof(struct stm32_rng_platdata),
+	.platdata_auto	= sizeof(struct stm32_rng_platdata),
 	.ofdata_to_platdata = stm32_rng_ofdata_to_platdata,
 };
diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c
index 0a30e0eabb4..16501cfe5d3 100644
--- a/drivers/rtc/ds3232.c
+++ b/drivers/rtc/ds3232.c
@@ -272,5 +272,5 @@  U_BOOT_DRIVER(rtc_ds3232) = {
 	.probe = ds3232_probe,
 	.of_match = ds3232_rtc_ids,
 	.ops = &ds3232_rtc_ops,
-	.priv_auto_alloc_size = sizeof(struct ds3232_priv_data),
+	.priv_auto	= sizeof(struct ds3232_priv_data),
 };
diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c
index 7e522103fd5..1dc80ca1274 100644
--- a/drivers/rtc/emul_rtc.c
+++ b/drivers/rtc/emul_rtc.c
@@ -88,7 +88,7 @@  U_BOOT_DRIVER(rtc_emul) = {
 	.id	= UCLASS_RTC,
 	.ops	= &emul_rtc_ops,
 	.probe	= emul_rtc_probe,
-	.priv_auto_alloc_size = sizeof(struct emul_rtc),
+	.priv_auto	= sizeof(struct emul_rtc),
 };
 
 U_BOOT_DEVICE(rtc_emul) = {
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index 7f78ff83cb0..762769d54cc 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -230,7 +230,7 @@  U_BOOT_DRIVER(sandbox_i2c_rtc_emul) = {
 	.id		= UCLASS_I2C_EMUL,
 	.of_match	= sandbox_i2c_rtc_ids,
 	.bind		= sandbox_i2c_rtc_bind,
-	.priv_auto_alloc_size = sizeof(struct sandbox_i2c_rtc),
-	.platdata_auto_alloc_size = sizeof(struct sandbox_i2c_rtc_plat_data),
+	.priv_auto	= sizeof(struct sandbox_i2c_rtc),
+	.platdata_auto	= sizeof(struct sandbox_i2c_rtc_plat_data),
 	.ops		= &sandbox_i2c_rtc_emul_ops,
 };
diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c
index 1b6717232c7..7a6d86d3bfd 100644
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -137,6 +137,6 @@  U_BOOT_DRIVER(rtc_pl031) = {
 	.of_match = pl031_ids,
 	.probe	= pl031_probe,
 	.ofdata_to_platdata = pl031_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
+	.platdata_auto	= sizeof(struct pl031_platdata),
 	.ops	= &pl031_ops,
 };
diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c
index f9db318af1d..f1d0ea90d3c 100644
--- a/drivers/rtc/stm32_rtc.c
+++ b/drivers/rtc/stm32_rtc.c
@@ -327,5 +327,5 @@  U_BOOT_DRIVER(rtc_stm32) = {
 	.probe	= stm32_rtc_probe,
 	.of_match = stm32_rtc_ids,
 	.ops	= &stm32_rtc_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_rtc_priv),
+	.priv_auto	= sizeof(struct stm32_rtc_priv),
 };
diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c
index acf3b3dc957..2b34d0516e6 100644
--- a/drivers/scsi/scsi-uclass.c
+++ b/drivers/scsi/scsi-uclass.c
@@ -35,5 +35,5 @@  int scsi_bus_reset(struct udevice *dev)
 UCLASS_DRIVER(scsi) = {
 	.id		= UCLASS_SCSI,
 	.name		= "scsi",
-	.per_device_platdata_auto_alloc_size = sizeof(struct scsi_platdata),
+	.per_device_platdata_auto	= sizeof(struct scsi_platdata),
 };
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 35b76f53f93..173ac240ea6 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -119,7 +119,7 @@  U_BOOT_DRIVER(altera_jtaguart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = altera_jtaguart_ids,
 	.ofdata_to_platdata = altera_jtaguart_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_jtaguart_platdata),
+	.platdata_auto	= sizeof(struct altera_jtaguart_platdata),
 	.probe = altera_jtaguart_probe,
 	.ops	= &altera_jtaguart_ops,
 };
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 0be5cd75c85..eec70f60005 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -112,7 +112,7 @@  U_BOOT_DRIVER(altera_uart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = altera_uart_ids,
 	.ofdata_to_platdata = altera_uart_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_uart_platdata),
+	.platdata_auto	= sizeof(struct altera_uart_platdata),
 	.probe = altera_uart_probe,
 	.ops	= &altera_uart_ops,
 };
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f759ea8893d..45e6554f593 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -304,14 +304,14 @@  U_BOOT_DRIVER(serial_atmel) = {
 	.id	= UCLASS_SERIAL,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = atmel_serial_ids,
-	.platdata_auto_alloc_size = sizeof(struct atmel_serial_platdata),
+	.platdata_auto	= sizeof(struct atmel_serial_platdata),
 #endif
 	.probe = atmel_serial_probe,
 	.ops	= &atmel_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags = DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size	= sizeof(struct atmel_serial_priv),
+	.priv_auto	= sizeof(struct atmel_serial_priv),
 };
 #endif
 
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 7d31c6d4a14..80b63807d60 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -107,6 +107,6 @@  U_BOOT_DRIVER(lpc32xx_hsuart) = {
 	.id	= UCLASS_SERIAL,
 	.probe	= lpc32xx_hsuart_probe,
 	.ops	= &lpc32xx_hsuart_ops,
-	.priv_auto_alloc_size = sizeof(struct lpc32xx_hsuart_priv),
+	.priv_auto	= sizeof(struct lpc32xx_hsuart_priv),
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 702109b23b6..9b83f88187d 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -611,9 +611,9 @@  U_BOOT_DRIVER(ns16550_serial) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = ns16550_serial_ids,
 	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
 #endif
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index db2fbac6295..aea7db6e00f 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -259,8 +259,8 @@  U_BOOT_DRIVER(sandbox_serial) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = sandbox_serial_ids,
 	.ofdata_to_platdata = sandbox_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sandbox_serial_platdata),
-	.priv_auto_alloc_size = sizeof(struct sandbox_serial_priv),
+	.platdata_auto	= sizeof(struct sandbox_serial_platdata),
+	.priv_auto	= sizeof(struct sandbox_serial_priv),
 	.probe = sandbox_serial_probe,
 	.remove = sandbox_serial_remove,
 	.ops	= &sandbox_serial_ops,
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index f3c25d42167..b6457242dea 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -507,6 +507,6 @@  UCLASS_DRIVER(serial) = {
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_probe	= serial_post_probe,
 	.pre_remove	= serial_pre_remove,
-	.per_device_auto_alloc_size = sizeof(struct serial_dev_priv),
+	.per_device_auto	= sizeof(struct serial_dev_priv),
 };
 #endif
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 9de94b69bd0..da06bef97c7 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -188,7 +188,7 @@  U_BOOT_DRIVER(serial_ar933x) = {
 	.name   = "serial_ar933x",
 	.id = UCLASS_SERIAL,
 	.of_match = ar933x_serial_ids,
-	.priv_auto_alloc_size = sizeof(struct ar933x_serial_priv),
+	.priv_auto	= sizeof(struct ar933x_serial_priv),
 	.probe = ar933x_serial_probe,
 	.ops    = &ar933x_serial_ops,
 };
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 04063fbe399..52dce3505e4 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -126,7 +126,7 @@  U_BOOT_DRIVER(serial_arc) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = arc_serial_ids,
 	.ofdata_to_platdata = arc_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct arc_serial_platdata),
+	.platdata_auto	= sizeof(struct arc_serial_platdata),
 	.probe = arc_serial_probe,
 	.ops	= &arc_serial_ops,
 };
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 8a4af87eb64..8cd533f8085 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -194,11 +194,11 @@  U_BOOT_DRIVER(serial_bcm283x_mu) = {
 	.name = "serial_bcm283x_mu",
 	.id = UCLASS_SERIAL,
 	.of_match = of_match_ptr(bcm283x_mu_serial_id),
-	.platdata_auto_alloc_size = sizeof(struct bcm283x_mu_serial_platdata),
+	.platdata_auto	= sizeof(struct bcm283x_mu_serial_platdata),
 	.probe = bcm283x_mu_serial_probe,
 	.ops = &bcm283x_mu_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD)
 	.flags = DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size = sizeof(struct bcm283x_mu_priv),
+	.priv_auto	= sizeof(struct bcm283x_mu_priv),
 };
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 923f402fbe9..484a2818119 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -92,10 +92,10 @@  U_BOOT_DRIVER(bcm283x_pl011_uart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(bcm283x_pl011_serial_id),
 	.probe	= bcm283x_pl011_serial_probe,
-	.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
+	.platdata_auto	= sizeof(struct pl01x_serial_platdata),
 	.ops	= &bcm283x_pl011_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size = sizeof(struct pl01x_priv),
+	.priv_auto	= sizeof(struct pl01x_priv),
 };
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 5b963ce45bc..f08e91ff3ba 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -262,7 +262,7 @@  U_BOOT_DRIVER(bcm6345_serial) = {
 	.id = UCLASS_SERIAL,
 	.of_match = bcm6345_serial_ids,
 	.probe = bcm6345_serial_probe,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_serial_priv),
+	.priv_auto	= sizeof(struct bcm6345_serial_priv),
 	.ops = &bcm6345_serial_ops,
 };
 
diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
index ccab347514c..08363c4920b 100644
--- a/drivers/serial/serial_coreboot.c
+++ b/drivers/serial/serial_coreboot.c
@@ -37,8 +37,8 @@  U_BOOT_DRIVER(coreboot_uart) = {
 	.name	= "coreboot_uart",
 	.id	= UCLASS_SERIAL,
 	.of_match	= coreboot_serial_ids,
-	.priv_auto_alloc_size = sizeof(struct NS16550),
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
 	.ofdata_to_platdata  = coreboot_ofdata_to_platdata,
 	.probe	= ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index cc20673efef..a0ae2fe0a4c 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -159,7 +159,7 @@  U_BOOT_DRIVER(serial_cortina) = {
 	.id = UCLASS_SERIAL,
 	.of_match = ca_serial_ids,
 	.ofdata_to_platdata = ca_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ca_uart_priv),
+	.priv_auto	= sizeof(struct ca_uart_priv),
 	.probe = ca_serial_probe,
 	.ops = &ca_serial_ops
 };
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index b152e102587..33ddbd6080c 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -150,7 +150,7 @@  U_BOOT_DRIVER(serial_efi) = {
 	.name	= "serial_efi",
 	.id	= UCLASS_SERIAL,
 	.of_match = serial_efi_ids,
-	.priv_auto_alloc_size = sizeof(struct serial_efi_priv),
+	.priv_auto	= sizeof(struct serial_efi_priv),
 	.probe = serial_efi_probe,
 	.ops	= &serial_efi_ops,
 };
diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c
index 39bd40e68be..f9281590cd4 100644
--- a/drivers/serial/serial_intel_mid.c
+++ b/drivers/serial/serial_intel_mid.c
@@ -60,8 +60,8 @@  U_BOOT_DRIVER(serial_intel_mid) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = mid_serial_ids,
 	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe	= mid_serial_probe,
 	.ops	= &ns16550_serial_ops,
 };
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index 83dc96c449c..af7b842927a 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -190,7 +190,7 @@  U_BOOT_DRIVER(serial_linflex) = {
 	.probe = linflex_serial_probe,
 	.ops	= &linflex_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
-	.priv_auto_alloc_size	= sizeof(struct linflex_serial_priv),
+	.priv_auto	= sizeof(struct linflex_serial_priv),
 };
 
 #ifdef CONFIG_DEBUG_UART_LINFLEXUART
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 95cbe63b3d1..b26f401cb70 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -567,7 +567,7 @@  U_BOOT_DRIVER(serial_lpuart) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = lpuart_serial_ids,
 	.ofdata_to_platdata = lpuart_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata),
+	.platdata_auto	= sizeof(struct lpuart_serial_platdata),
 	.probe = lpuart_serial_probe,
 	.ops	= &lpuart_serial_ops,
 };
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index dee1706a218..d88b9f1b9f0 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -172,7 +172,7 @@  U_BOOT_DRIVER(serial_coldfire) = {
 	.id = UCLASS_SERIAL,
 	.of_match = coldfire_serial_ids,
 	.ofdata_to_platdata = coldfire_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct coldfire_serial_platdata),
+	.platdata_auto	= sizeof(struct coldfire_serial_platdata),
 	.probe = coldfire_serial_probe,
 	.ops = &coldfire_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 496a2ca2c35..73a10f89c01 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -169,7 +169,7 @@  U_BOOT_DRIVER(serial_meson) = {
 	.probe		= meson_serial_probe,
 	.ops		= &meson_serial_ops,
 	.ofdata_to_platdata = meson_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct meson_serial_platdata),
+	.platdata_auto	= sizeof(struct meson_serial_platdata),
 };
 
 #ifdef CONFIG_DEBUG_UART_MESON
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index c8946c3aae8..3b088b3b23a 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -240,7 +240,7 @@  U_BOOT_DRIVER(serial_msm) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = msm_serial_ids,
 	.ofdata_to_platdata = msm_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct msm_serial_data),
+	.priv_auto	= sizeof(struct msm_serial_data),
 	.probe = msm_serial_probe,
 	.ops	= &msm_serial_ops,
 };
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 778a04d87e0..afa6e8c8a96 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -268,7 +268,7 @@  U_BOOT_DRIVER(serial_mtk) = {
 	.id = UCLASS_SERIAL,
 	.of_match = mtk_serial_ids,
 	.ofdata_to_platdata = mtk_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct mtk_serial_priv),
+	.priv_auto	= sizeof(struct mtk_serial_priv),
 	.probe = mtk_serial_probe,
 	.ops = &mtk_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index fb43f88eaf6..7756b0d929d 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -126,7 +126,7 @@  U_BOOT_DRIVER(serial_mvebu) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = mvebu_serial_ids,
 	.ofdata_to_platdata = mvebu_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_platdata),
+	.platdata_auto	= sizeof(struct mvebu_platdata),
 	.probe	= mvebu_serial_probe,
 	.ops	= &mvebu_serial_ops,
 };
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index de6cefcd3ac..83f2316a64b 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -358,7 +358,7 @@  U_BOOT_DRIVER(serial_mxc) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match = mxc_serial_ids,
 	.ofdata_to_platdata = mxc_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mxc_serial_platdata),
+	.platdata_auto	= sizeof(struct mxc_serial_platdata),
 #endif
 	.probe = mxc_serial_probe,
 	.ops	= &mxc_serial_ops,
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index f7997fc788f..296c5fd45c1 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -158,9 +158,9 @@  U_BOOT_DRIVER(omap_serial) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap_serial_ids,
 	.ofdata_to_platdata = omap_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+	.platdata_auto	= sizeof(struct ns16550_platdata),
 #endif
-	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.priv_auto	= sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 2651a45a7f3..0e67bc124b0 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -130,7 +130,7 @@  U_BOOT_DRIVER(serial_owl) = {
 	.id = UCLASS_SERIAL,
 	.of_match = owl_serial_ids,
 	.ofdata_to_platdata = owl_serial_ofdata_to_platdata,
-	.priv_auto_alloc_size =	sizeof(struct owl_serial_priv),
+	.priv_auto	=	sizeof(struct owl_serial_priv),
 	.probe = owl_serial_probe,
 	.ops = &owl_serial_ops,
 };
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index a492063e39c..5d1dbe7a917 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -178,7 +178,7 @@  U_BOOT_DRIVER(pic32_serial) = {
 	.of_match	= pic32_uart_ids,
 	.probe		= pic32_uart_probe,
 	.ops		= &pic32_uart_ops,
-	.priv_auto_alloc_size = sizeof(struct pic32_uart_priv),
+	.priv_auto	= sizeof(struct pic32_uart_priv),
 };
 
 #ifdef CONFIG_DEBUG_UART_PIC32
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index d9e35c6a2b4..4e201287bf0 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -388,11 +388,11 @@  U_BOOT_DRIVER(serial_pl01x) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(pl01x_serial_id),
 	.ofdata_to_platdata = of_match_ptr(pl01x_serial_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata),
+	.platdata_auto	= sizeof(struct pl01x_serial_platdata),
 	.probe = pl01x_serial_probe,
 	.ops	= &pl01x_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
-	.priv_auto_alloc_size = sizeof(struct pl01x_priv),
+	.priv_auto	= sizeof(struct pl01x_priv),
 };
 
 #endif
diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
index b1718f72d1b..74245f8d5dc 100644
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -42,8 +42,8 @@  static int rockchip_serial_probe(struct udevice *dev)
 U_BOOT_DRIVER(rockchip_rk3188_uart) = {
 	.name	= "rockchip_rk3188_uart",
 	.id	= UCLASS_SERIAL,
-	.priv_auto_alloc_size = sizeof(struct NS16550),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata),
+	.priv_auto	= sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct rockchip_uart_platdata),
 	.probe	= rockchip_serial_probe,
 	.ops	= &ns16550_serial_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
@@ -52,8 +52,8 @@  U_BOOT_DRIVER(rockchip_rk3188_uart) = {
 U_BOOT_DRIVER(rockchip_rk3288_uart) = {
 	.name	= "rockchip_rk3288_uart",
 	.id	= UCLASS_SERIAL,
-	.priv_auto_alloc_size = sizeof(struct NS16550),
-	.platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata),
+	.priv_auto	= sizeof(struct NS16550),
+	.platdata_auto	= sizeof(struct rockchip_uart_platdata),
 	.probe	= rockchip_serial_probe,
 	.ops	= &ns16550_serial_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 57eb6963b61..2f15525c487 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -208,7 +208,7 @@  U_BOOT_DRIVER(serial_s5p) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = s5p_serial_ids,
 	.ofdata_to_platdata = s5p_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct s5p_serial_platdata),
+	.platdata_auto	= sizeof(struct s5p_serial_platdata),
 	.probe = s5p_serial_probe,
 	.ops	= &s5p_serial_ops,
 };
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e27d256574f..4e37ab0c318 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -240,13 +240,13 @@  U_BOOT_DRIVER(serial_sh) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = of_match_ptr(sh_serial_id),
 	.ofdata_to_platdata = of_match_ptr(sh_serial_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct sh_serial_platdata),
+	.platdata_auto	= sizeof(struct sh_serial_platdata),
 	.probe	= sh_serial_probe,
 	.ops	= &sh_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 	.flags	= DM_FLAG_PRE_RELOC,
 #endif
-	.priv_auto_alloc_size = sizeof(struct uart_port),
+	.priv_auto	= sizeof(struct uart_port),
 };
 
 #else /* CONFIG_DM_SERIAL */
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index fcc47fb348f..710bb72363f 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -202,7 +202,7 @@  U_BOOT_DRIVER(serial_sifive) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = sifive_serial_ids,
 	.ofdata_to_platdata = sifive_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sifive_uart_platdata),
+	.platdata_auto	= sizeof(struct sifive_uart_platdata),
 	.probe = sifive_serial_probe,
 	.ops	= &sifive_serial_ops,
 };
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 33ff396bff7..ded684abfbb 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -206,6 +206,6 @@  U_BOOT_DRIVER(serial_sti_asc) = {
 	.of_match = sti_serial_of_match,
 	.ops = &sti_asc_serial_ops,
 	.probe = sti_asc_serial_probe,
-	.priv_auto_alloc_size = sizeof(struct sti_asc_serial),
+	.priv_auto	= sizeof(struct sti_asc_serial),
 };
 
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index cab0db2c96a..a8e03207503 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -241,7 +241,7 @@  U_BOOT_DRIVER(serial_stm32) = {
 	.id = UCLASS_SERIAL,
 	.of_match = of_match_ptr(stm32_serial_id),
 	.ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata),
-	.platdata_auto_alloc_size = sizeof(struct stm32x7_serial_platdata),
+	.platdata_auto	= sizeof(struct stm32x7_serial_platdata),
 	.ops = &stm32_serial_ops,
 	.probe = stm32_serial_probe,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index a098028ca00..27e4b92c399 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -172,6 +172,6 @@  U_BOOT_DRIVER(uniphier_serial) = {
 	.id = UCLASS_SERIAL,
 	.of_match = uniphier_uart_of_match,
 	.probe = uniphier_serial_probe,
-	.priv_auto_alloc_size = sizeof(struct uniphier_serial_priv),
+	.priv_auto	= sizeof(struct uniphier_serial_priv),
 	.ops = &uniphier_serial_ops,
 };
diff --git a/drivers/serial/serial_xen.c b/drivers/serial/serial_xen.c
index ba6504b9479..dbb7b22b51c 100644
--- a/drivers/serial/serial_xen.c
+++ b/drivers/serial/serial_xen.c
@@ -172,7 +172,7 @@  U_BOOT_DRIVER(serial_xen) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.of_match		= xen_serial_ids,
 #endif
-	.priv_auto_alloc_size	= sizeof(struct xen_uart_priv),
+	.priv_auto	= sizeof(struct xen_uart_priv),
 	.probe			= xen_serial_probe,
 	.ops			= &xen_serial_ops,
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 236ab860ad8..bc039492ef8 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -132,7 +132,7 @@  U_BOOT_DRIVER(serial_uartlite) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = uartlite_serial_ids,
 	.ofdata_to_platdata = uartlite_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct uartlite_platdata),
+	.platdata_auto	= sizeof(struct uartlite_platdata),
 	.probe = uartlite_serial_probe,
 	.ops	= &uartlite_serial_ops,
 };
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 0e71cada1bb..d04c3990198 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -212,7 +212,7 @@  U_BOOT_DRIVER(serial_zynq) = {
 	.id	= UCLASS_SERIAL,
 	.of_match = zynq_serial_ids,
 	.ofdata_to_platdata = zynq_serial_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynq_uart_platdata),
+	.platdata_auto	= sizeof(struct zynq_uart_platdata),
 	.probe = zynq_serial_probe,
 	.ops	= &zynq_serial_ops,
 };
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index 94285403ca2..e1cbd6eef89 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -124,5 +124,5 @@  U_BOOT_DRIVER(soc_ti_k3) = {
 	.ops		= &soc_ti_k3_ops,
 	.of_match       = soc_ti_k3_ids,
 	.probe          = soc_ti_k3_probe,
-	.platdata_auto_alloc_size = sizeof(struct soc_ti_k3_platdata),
+	.platdata_auto	= sizeof(struct soc_ti_k3_platdata),
 };
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index c48e9befe4b..c5099ad084d 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -1130,5 +1130,5 @@  U_BOOT_DRIVER(k3_navss_ringacc) = {
 	.id	= UCLASS_MISC,
 	.of_match = knav_ringacc_ids,
 	.probe = k3_nav_ringacc_probe,
-	.priv_auto_alloc_size = sizeof(struct k3_nav_ringacc),
+	.priv_auto	= sizeof(struct k3_nav_ringacc),
 };
diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c
index adb0b2b104d..7f754e65676 100644
--- a/drivers/sound/broadwell_i2s.c
+++ b/drivers/sound/broadwell_i2s.c
@@ -304,5 +304,5 @@  U_BOOT_DRIVER(broadwell_i2s) = {
 	.of_match	= broadwell_i2s_ids,
 	.probe		= broadwell_i2s_probe,
 	.ops		= &broadwell_i2s_ops,
-	.priv_auto_alloc_size	= sizeof(struct broadwell_i2s_priv),
+	.priv_auto	= sizeof(struct broadwell_i2s_priv),
 };
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 4154d293998..eb92830ad9c 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -539,7 +539,7 @@  U_BOOT_DRIVER(hda_codec) = {
 	.name		= "hda_codec",
 	.id		= UCLASS_SOUND,
 	.ops		= &hda_codec_ops,
-	.priv_auto_alloc_size	= sizeof(struct hda_codec_priv),
+	.priv_auto	= sizeof(struct hda_codec_priv),
 	.probe		= hda_codec_init,
 };
 
diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c
index b741e3952d1..2639c86ea21 100644
--- a/drivers/sound/i2s-uclass.c
+++ b/drivers/sound/i2s-uclass.c
@@ -21,5 +21,5 @@  int i2s_tx_data(struct udevice *dev, void *data, uint data_size)
 UCLASS_DRIVER(i2s) = {
 	.id		= UCLASS_I2S,
 	.name		= "i2s",
-	.per_device_auto_alloc_size	= sizeof(struct i2s_uc_priv),
+	.per_device_auto	= sizeof(struct i2s_uc_priv),
 };
diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c
index bc3c1e85f8c..62207b957cf 100644
--- a/drivers/sound/ivybridge_sound.c
+++ b/drivers/sound/ivybridge_sound.c
@@ -135,5 +135,5 @@  U_BOOT_DRIVER(bd82x6x_azalia_drv) = {
 	.of_match	= bd82x6x_azalia_ids,
 	.probe		= bd82x6x_azalia_probe,
 	.ops		= &bd82x6x_azalia_ops,
-	.priv_auto_alloc_size	= sizeof(struct hda_codec_priv),
+	.priv_auto	= sizeof(struct hda_codec_priv),
 };
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index 5b4c489f4b1..4bcb7482b20 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -421,5 +421,5 @@  U_BOOT_DRIVER(max98088) = {
 	.of_match	= max98088_ids,
 	.probe		= max98088_probe,
 	.ops		= &max98088_ops,
-	.priv_auto_alloc_size	= sizeof(struct maxim_priv),
+	.priv_auto	= sizeof(struct maxim_priv),
 };
diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c
index d23955d6e10..c77a7322778 100644
--- a/drivers/sound/max98090.c
+++ b/drivers/sound/max98090.c
@@ -368,5 +368,5 @@  U_BOOT_DRIVER(max98090) = {
 	.of_match	= max98090_ids,
 	.probe		= max98090_probe,
 	.ops		= &max98090_ops,
-	.priv_auto_alloc_size	= sizeof(struct maxim_priv),
+	.priv_auto	= sizeof(struct maxim_priv),
 };
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 5037f9516fa..002dab437fa 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -462,5 +462,5 @@  U_BOOT_DRIVER(max98095) = {
 	.of_match	= max98095_ids,
 	.probe		= max98095_probe,
 	.ops		= &max98095_ops,
-	.priv_auto_alloc_size	= sizeof(struct maxim_priv),
+	.priv_auto	= sizeof(struct maxim_priv),
 };
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index 16aa9dfc5b2..b655bb40b64 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -331,5 +331,5 @@  U_BOOT_DRIVER(rt5677_drv) = {
 	.of_match	= rt5677_ids,
 	.ops		= &rt5677_ops,
 	.probe		= rt5677_probe,
-	.priv_auto_alloc_size	= sizeof(struct rt5677_priv),
+	.priv_auto	= sizeof(struct rt5677_priv),
 };
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index 0686add3c8b..4a2c87a84c6 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -223,7 +223,7 @@  U_BOOT_DRIVER(sandbox_codec) = {
 	.id		= UCLASS_AUDIO_CODEC,
 	.of_match	= sandbox_codec_ids,
 	.ops		= &sandbox_codec_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_codec_priv),
+	.priv_auto	= sizeof(struct sandbox_codec_priv),
 };
 
 static const struct i2s_ops sandbox_i2s_ops = {
@@ -241,7 +241,7 @@  U_BOOT_DRIVER(sandbox_i2s) = {
 	.of_match	= sandbox_i2s_ids,
 	.ops		= &sandbox_i2s_ops,
 	.probe		= sandbox_i2s_probe,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_i2s_priv),
+	.priv_auto	= sizeof(struct sandbox_i2s_priv),
 };
 
 static const struct sound_ops sandbox_sound_ops = {
@@ -262,6 +262,6 @@  U_BOOT_DRIVER(sandbox_sound) = {
 	.id		= UCLASS_SOUND,
 	.of_match	= sandbox_sound_ids,
 	.ops		= &sandbox_sound_ops,
-	.priv_auto_alloc_size	= sizeof(struct sandbox_sound_priv),
+	.priv_auto	= sizeof(struct sandbox_sound_priv),
 	.probe		= sandbox_sound_probe,
 };
diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 92f4b0b924b..0c71e01f337 100644
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -172,5 +172,5 @@  int sound_find_codec_i2s(struct udevice *dev)
 UCLASS_DRIVER(sound) = {
 	.id		= UCLASS_SOUND,
 	.name		= "sound",
-	.per_device_auto_alloc_size	= sizeof(struct sound_uc_priv),
+	.per_device_auto	= sizeof(struct sound_uc_priv),
 };
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 26d457255c9..8708fc44a9e 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -253,5 +253,5 @@  U_BOOT_DRIVER(tegra_ahub) = {
 	.of_match	= tegra_ahub_ids,
 	.ops		= &tegra_ahub_ops,
 	.probe		= tegra_ahub_probe,
-	.priv_auto_alloc_size	= sizeof(struct tegra_ahub_priv),
+	.priv_auto	= sizeof(struct tegra_ahub_priv),
 };
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index 367e1445417..cb1e97d7a5a 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -873,5 +873,5 @@  U_BOOT_DRIVER(wm8994) = {
 	.of_match	= wm8994_ids,
 	.probe		= wm8994_probe,
 	.ops		= &wm8994_ops,
-	.priv_auto_alloc_size	= sizeof(struct wm8994_priv),
+	.priv_auto	= sizeof(struct wm8994_priv),
 };
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 1529002cac1..07bf3c9a0f8 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -203,7 +203,7 @@  U_BOOT_DRIVER(altera_spi) = {
 	.of_match = altera_spi_ids,
 	.ops	= &altera_spi_ops,
 	.ofdata_to_platdata = altera_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct altera_spi_priv),
+	.platdata_auto	= sizeof(struct altera_spi_platdata),
+	.priv_auto	= sizeof(struct altera_spi_priv),
 	.probe	= altera_spi_probe,
 };
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 39c6e226ba7..82534d9c693 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -409,6 +409,6 @@  U_BOOT_DRIVER(atcspi200_spi) = {
 	.of_match = atcspi200_spi_ids,
 	.ops = &atcspi200_spi_ops,
 	.ofdata_to_platdata = atcspi200_ofdata_to_platadata,
-	.priv_auto_alloc_size = sizeof(struct nds_spi_slave),
+	.priv_auto	= sizeof(struct nds_spi_slave),
 	.probe = atcspi200_spi_probe,
 };
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index 70bedc7fbe3..e5d54faf7df 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -224,6 +224,6 @@  U_BOOT_DRIVER(ath79_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = ath79_spi_ids,
 	.ops    = &ath79_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct ath79_spi_priv),
+	.priv_auto	= sizeof(struct ath79_spi_priv),
 	.probe  = ath79_spi_probe,
 };
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 9320a8be685..b1a3aa9a297 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -624,6 +624,6 @@  U_BOOT_DRIVER(atmel_qspi) = {
 	.id             = UCLASS_SPI,
 	.of_match       = atmel_qspi_ids,
 	.ops            = &atmel_qspi_ops,
-	.priv_auto_alloc_size = sizeof(struct atmel_qspi),
+	.priv_auto	= sizeof(struct atmel_qspi),
 	.probe          = atmel_qspi_probe,
 };
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c65733c87ac..873f854cc9a 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -388,7 +388,7 @@  U_BOOT_DRIVER(atmel_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = atmel_spi_ids,
 	.ops	= &atmel_spi_ops,
-	.platdata_auto_alloc_size = sizeof(struct atmel_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct atmel_spi_priv),
+	.platdata_auto	= sizeof(struct atmel_spi_platdata),
+	.priv_auto	= sizeof(struct atmel_spi_priv),
 	.probe	= atmel_spi_probe,
 };
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f30a8a42bd4..c4a04ba6fd2 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -403,7 +403,7 @@  U_BOOT_DRIVER(bcm63xx_hsspi) = {
 	.id = UCLASS_SPI,
 	.of_match = bcm63xx_hsspi_ids,
 	.ops = &bcm63xx_hsspi_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm63xx_hsspi_priv),
+	.priv_auto	= sizeof(struct bcm63xx_hsspi_priv),
 	.child_pre_probe = bcm63xx_hsspi_child_pre_probe,
 	.probe = bcm63xx_hsspi_probe,
 };
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index acc1a493c4e..97b72d263ae 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -422,7 +422,7 @@  U_BOOT_DRIVER(bcm63xx_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = bcm63xx_spi_ids,
 	.ops = &bcm63xx_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm63xx_spi_priv),
+	.priv_auto	= sizeof(struct bcm63xx_spi_priv),
 	.child_pre_probe = bcm63xx_spi_child_pre_probe,
 	.probe = bcm63xx_spi_probe,
 };
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index fb1dc46b704..d5ec2bccfb0 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -434,6 +434,6 @@  U_BOOT_DRIVER(bcmstb_spi) = {
 	.ops				= &bcmstb_spi_ops,
 	.ofdata_to_platdata		= bcmstb_spi_ofdata_to_platdata,
 	.probe				= bcmstb_spi_probe,
-	.platdata_auto_alloc_size	= sizeof(struct bcmstb_spi_platdata),
-	.priv_auto_alloc_size		= sizeof(struct bcmstb_spi_priv),
+	.platdata_auto	= sizeof(struct bcmstb_spi_platdata),
+	.priv_auto		= sizeof(struct bcmstb_spi_priv),
 };
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 1e857492090..dcee7b77033 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -354,8 +354,8 @@  U_BOOT_DRIVER(cadence_spi) = {
 	.of_match = cadence_spi_ids,
 	.ops = &cadence_spi_ops,
 	.ofdata_to_platdata = cadence_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct cadence_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct cadence_spi_priv),
+	.platdata_auto	= sizeof(struct cadence_spi_platdata),
+	.priv_auto	= sizeof(struct cadence_spi_priv),
 	.probe = cadence_spi_probe,
 	.remove = cadence_spi_remove,
 	.flags = DM_FLAG_OS_PREPARE,
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 8f1c8b8c0fb..0fa61efc23b 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -452,9 +452,9 @@  U_BOOT_DRIVER(coldfire_spi) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = coldfire_spi_ids,
 	.ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct coldfire_spi_platdata),
+	.platdata_auto	= sizeof(struct coldfire_spi_platdata),
 #endif
 	.probe = coldfire_spi_probe,
 	.ops = &coldfire_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct coldfire_spi_priv),
+	.priv_auto	= sizeof(struct coldfire_spi_priv),
 };
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index a11433db1e9..b69224e9832 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -420,9 +420,9 @@  U_BOOT_DRIVER(davinci_spi) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = davinci_spi_ids,
 	.ofdata_to_platdata = davinci_ofdata_to_platadata,
-        .platdata_auto_alloc_size = sizeof(struct davinci_spi_platdata),
+        .platdata_auto	= sizeof(struct davinci_spi_platdata),
 #endif
 	.probe = davinci_spi_probe,
 	.ops = &davinci_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct davinci_spi_slave),
+	.priv_auto	= sizeof(struct davinci_spi_slave),
 };
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 2559aac2e94..8d48e04ed1f 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -560,8 +560,8 @@  U_BOOT_DRIVER(dw_spi) = {
 	.of_match = dw_spi_ids,
 	.ops = &dw_spi_ops,
 	.ofdata_to_platdata = dw_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct dw_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct dw_spi_priv),
+	.platdata_auto	= sizeof(struct dw_spi_platdata),
+	.priv_auto	= sizeof(struct dw_spi_priv),
 	.probe = dw_spi_probe,
 	.remove = dw_spi_remove,
 };
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index d338ff5a0bd..8a82e60f008 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -427,7 +427,7 @@  U_BOOT_DRIVER(exynos_spi) = {
 	.of_match = exynos_spi_ids,
 	.ops	= &exynos_spi_ops,
 	.ofdata_to_platdata = exynos_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct exynos_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct exynos_spi_priv),
+	.platdata_auto	= sizeof(struct exynos_spi_platdata),
+	.priv_auto	= sizeof(struct exynos_spi_priv),
 	.probe	= exynos_spi_probe,
 };
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 67807b2e109..352a82c0b69 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -660,8 +660,8 @@  U_BOOT_DRIVER(fsl_dspi) = {
 	.of_match = fsl_dspi_ids,
 	.ops	= &fsl_dspi_ops,
 	.ofdata_to_platdata = fsl_dspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct fsl_dspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct fsl_dspi_priv),
+	.platdata_auto	= sizeof(struct fsl_dspi_platdata),
+	.priv_auto	= sizeof(struct fsl_dspi_priv),
 	.probe	= fsl_dspi_probe,
 	.child_pre_probe = fsl_dspi_child_pre_probe,
 	.bind = fsl_dspi_bind,
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 5cd6577b85a..af9bcfdd7e9 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -576,8 +576,8 @@  U_BOOT_DRIVER(fsl_espi) = {
 	.ofdata_to_platdata = fsl_espi_ofdata_to_platdata,
 #endif
 	.ops	= &fsl_espi_ops,
-	.platdata_auto_alloc_size = sizeof(struct fsl_espi_platdata),
-	.priv_auto_alloc_size = sizeof(struct fsl_spi_slave),
+	.platdata_auto	= sizeof(struct fsl_espi_platdata),
+	.priv_auto	= sizeof(struct fsl_spi_slave),
 	.probe	= fsl_espi_probe,
 	.child_pre_probe = fsl_espi_child_pre_probe,
 };
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 128f95877f2..412d0317043 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -887,6 +887,6 @@  U_BOOT_DRIVER(fsl_qspi) = {
 	.id	= UCLASS_SPI,
 	.of_match = fsl_qspi_ids,
 	.ops	= &fsl_qspi_ops,
-	.priv_auto_alloc_size = sizeof(struct fsl_qspi),
+	.priv_auto	= sizeof(struct fsl_qspi),
 	.probe	= fsl_qspi_probe,
 };
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index a91cb785680..d2fc9e24fad 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -1005,8 +1005,8 @@  U_BOOT_DRIVER(intel_fast_spi) = {
 	.of_match = ich_spi_ids,
 	.ops	= &ich_spi_ops,
 	.ofdata_to_platdata = ich_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct ich_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct ich_spi_priv),
+	.platdata_auto	= sizeof(struct ich_spi_platdata),
+	.priv_auto	= sizeof(struct ich_spi_priv),
 	.child_pre_probe = ich_spi_child_pre_probe,
 	.probe	= ich_spi_probe,
 	.remove	= ich_spi_remove,
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index dc7d2bc1f01..22f05409986 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -296,7 +296,7 @@  U_BOOT_DRIVER(mvebu_spi) = {
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,
 	.ofdata_to_platdata = mvebu_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct mvebu_spi_priv),
+	.platdata_auto	= sizeof(struct mvebu_spi_platdata),
+	.priv_auto	= sizeof(struct mvebu_spi_priv),
 	.probe = mvebu_spi_probe,
 };
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 2cdc0186825..d99a151406e 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -318,5 +318,5 @@  U_BOOT_DRIVER(meson_spifc) = {
 	.of_match	= meson_spifc_ids,
 	.ops		= &meson_spifc_ops,
 	.probe		= meson_spifc_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_spifc_priv),
+	.priv_auto	= sizeof(struct meson_spifc_priv),
 };
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index ec39c12b3de..378037f993e 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -281,5 +281,5 @@  U_BOOT_DRIVER(mpc8xxx_spi) = {
 	.ops	= &mpc8xxx_spi_ops,
 	.ofdata_to_platdata = mpc8xxx_spi_ofdata_to_platdata,
 	.probe	= mpc8xxx_spi_probe,
-	.priv_auto_alloc_size = sizeof(struct mpc8xxx_priv),
+	.priv_auto	= sizeof(struct mpc8xxx_priv),
 };
diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index e77447b6556..a1b617246df 100644
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -232,6 +232,6 @@  U_BOOT_DRIVER(mscc_bb) = {
 	.id	= UCLASS_SPI,
 	.of_match = mscc_bb_ids,
 	.ops	= &mscc_bb_ops,
-	.priv_auto_alloc_size = sizeof(struct mscc_bb_priv),
+	.priv_auto	= sizeof(struct mscc_bb_priv),
 	.probe	= mscc_bb_spi_probe,
 };
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 3a0738eb2b7..eb0931747b7 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -304,6 +304,6 @@  U_BOOT_DRIVER(mt7621_spi) = {
 	.id = UCLASS_SPI,
 	.of_match = mt7621_spi_ids,
 	.ops = &mt7621_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct mt7621_spi),
+	.priv_auto	= sizeof(struct mt7621_spi),
 	.probe = mt7621_spi_probe,
 };
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index c30c8f4ff6d..b6ab5fa3ada 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -313,6 +313,6 @@  U_BOOT_DRIVER(mtk_snfi_spi) = {
 	.id			= UCLASS_SPI,
 	.of_match		= mtk_snfi_spi_ids,
 	.ops			= &mtk_snfi_spi_ops,
-	.priv_auto_alloc_size	= sizeof(struct mtk_snfi_priv),
+	.priv_auto	= sizeof(struct mtk_snfi_priv),
 	.probe			= mtk_snfi_spi_probe,
 };
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index eb13cf349ef..b9e058acaa1 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -325,7 +325,7 @@  U_BOOT_DRIVER(mvebu_spi) = {
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,
 	.ofdata_to_platdata = mvebu_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_spi_platdata),
+	.platdata_auto	= sizeof(struct mvebu_spi_platdata),
 	.probe = mvebu_spi_probe,
 	.remove = mvebu_spi_remove,
 };
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index e90a06a66de..f571392e769 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -605,7 +605,7 @@  U_BOOT_DRIVER(mxc_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = mxc_spi_ids,
 	.ops	= &mxc_spi_ops,
-	.platdata_auto_alloc_size = sizeof(struct mxc_spi_slave),
+	.platdata_auto	= sizeof(struct mxc_spi_slave),
 	.probe	= mxc_spi_probe,
 };
 #endif
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index fb0af02be08..57e7a2eae67 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -487,9 +487,9 @@  U_BOOT_DRIVER(fsl_imx23_spi) = {
 	.of_match = mxs_spi_ids,
 	.ofdata_to_platdata = mxs_ofdata_to_platdata,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct mxs_spi_platdata),
+	.platdata_auto	= sizeof(struct mxs_spi_platdata),
 	.ops	= &mxs_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct mxs_spi_priv),
+	.priv_auto	= sizeof(struct mxs_spi_priv),
 	.probe	= mxs_spi_probe,
 };
 
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index 9661e9e10d7..96f981a1192 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -994,6 +994,6 @@  U_BOOT_DRIVER(nxp_fspi) = {
 	.of_match = nxp_fspi_ids,
 	.ops	= &nxp_fspi_ops,
 	.ofdata_to_platdata = nxp_fspi_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct nxp_fspi),
+	.priv_auto	= sizeof(struct nxp_fspi),
 	.probe	= nxp_fspi_probe,
 };
diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c
index 249b9690bea..72cd18526bf 100644
--- a/drivers/spi/octeon_spi.c
+++ b/drivers/spi/octeon_spi.c
@@ -611,6 +611,6 @@  U_BOOT_DRIVER(octeon_spi) = {
 	.id			= UCLASS_SPI,
 	.of_match		= octeon_spi_ids,
 	.probe			= octeon_spi_probe,
-	.priv_auto_alloc_size	= sizeof(struct octeon_spi),
+	.priv_auto	= sizeof(struct octeon_spi),
 	.ops			= &octeon_spi_ops,
 };
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 56cb2174868..1beaea77887 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -507,9 +507,9 @@  U_BOOT_DRIVER(omap3_spi) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = omap3_spi_ids,
 	.ofdata_to_platdata = omap3_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct omap3_spi_plat),
+	.platdata_auto	= sizeof(struct omap3_spi_plat),
 #endif
 	.probe = omap3_spi_probe,
 	.ops    = &omap3_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct omap3_spi_priv),
+	.priv_auto	= sizeof(struct omap3_spi_priv),
 };
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 97c2f939c0f..57c6a5d6abb 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -444,6 +444,6 @@  U_BOOT_DRIVER(pic32_spi) = {
 	.id		= UCLASS_SPI,
 	.of_match	= pic32_spi_ids,
 	.ops		= &pic32_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct pic32_spi_priv),
+	.priv_auto	= sizeof(struct pic32_spi_priv),
 	.probe		= pic32_spi_probe,
 };
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 32bb8c8d212..e9fd618562a 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -319,7 +319,7 @@  U_BOOT_DRIVER(pl022_spi) = {
 	.ofdata_to_platdata = pl022_spi_ofdata_to_platdata,
 #endif
 	.ops    = &pl022_spi_ops,
-	.platdata_auto_alloc_size = sizeof(struct pl022_spi_pdata),
-	.priv_auto_alloc_size = sizeof(struct pl022_spi_slave),
+	.platdata_auto	= sizeof(struct pl022_spi_pdata),
+	.priv_auto	= sizeof(struct pl022_spi_slave),
 	.probe  = pl022_spi_probe,
 };
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index d0ff918af88..7018814f9cb 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -464,8 +464,8 @@  U_BOOT_DRIVER(rpc_spi) = {
 	.of_match	= rpc_spi_ids,
 	.ops		= &rpc_spi_ops,
 	.ofdata_to_platdata = rpc_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rpc_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct rpc_spi_priv),
+	.platdata_auto	= sizeof(struct rpc_spi_platdata),
+	.priv_auto	= sizeof(struct rpc_spi_priv),
 	.bind		= rpc_spi_bind,
 	.probe		= rpc_spi_probe,
 };
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index 3f71ec99b11..bccdf4efdfa 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -560,8 +560,8 @@  U_BOOT_DRIVER(rockchip_rk3288_spi) = {
 	.of_match = rockchip_spi_ids,
 	.ops	= &rockchip_spi_ops,
 	.ofdata_to_platdata = rockchip_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rockchip_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct rockchip_spi_priv),
+	.platdata_auto	= sizeof(struct rockchip_spi_platdata),
+	.priv_auto	= sizeof(struct rockchip_spi_priv),
 	.probe	= rockchip_spi_probe,
 };
 
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index aa1c03047e2..35381c16b34 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -354,7 +354,7 @@  U_BOOT_DRIVER(sh_qspi) = {
 	.of_match	= sh_qspi_ids,
 	.ops		= &sh_qspi_ops,
 	.ofdata_to_platdata = sh_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct sh_qspi_slave),
+	.platdata_auto	= sizeof(struct sh_qspi_slave),
 	.probe		= sh_qspi_probe,
 };
 #endif
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 153bbf8b255..c71357795d3 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -281,7 +281,7 @@  U_BOOT_DRIVER(soft_spi) = {
 	.of_match = soft_spi_ids,
 	.ops	= &soft_spi_ops,
 	.ofdata_to_platdata = soft_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct soft_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct soft_spi_priv),
+	.platdata_auto	= sizeof(struct soft_spi_platdata),
+	.priv_auto	= sizeof(struct soft_spi_priv),
 	.probe	= soft_spi_probe,
 };
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 6f8df55fa56..721d65426bc 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -798,6 +798,6 @@  U_BOOT_DRIVER(spi_qup) = {
 	.id	= UCLASS_SPI,
 	.of_match = qup_spi_ids,
 	.ops	= &qup_spi_ops,
-	.priv_auto_alloc_size	= sizeof(struct qup_spi_priv),
+	.priv_auto	= sizeof(struct qup_spi_priv),
 	.probe	= qup_spi_probe,
 };
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index c7345d90428..fdbcdb8f43a 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -475,6 +475,6 @@  U_BOOT_DRIVER(sifive_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = sifive_spi_ids,
 	.ops	= &sifive_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct sifive_spi),
+	.priv_auto	= sizeof(struct sifive_spi),
 	.probe	= sifive_spi_probe,
 };
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 0844a5a0a6a..84c1ece409b 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -631,7 +631,7 @@  U_BOOT_DRIVER(sun4i_spi) = {
 	.of_match	= sun4i_spi_ids,
 	.ops	= &sun4i_spi_ops,
 	.ofdata_to_platdata	= sun4i_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size	= sizeof(struct sun4i_spi_platdata),
-	.priv_auto_alloc_size	= sizeof(struct sun4i_spi_priv),
+	.platdata_auto	= sizeof(struct sun4i_spi_platdata),
+	.priv_auto	= sizeof(struct sun4i_spi_priv),
 	.probe	= sun4i_spi_probe,
 };
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 08f165837d2..a03d35b1f8e 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -502,9 +502,9 @@  UCLASS_DRIVER(spi) = {
 #endif
 	.post_probe	= spi_post_probe,
 	.child_pre_probe = spi_child_pre_probe,
-	.per_device_auto_alloc_size = sizeof(struct dm_spi_bus),
-	.per_child_auto_alloc_size = sizeof(struct spi_slave),
-	.per_child_platdata_auto_alloc_size =
+	.per_device_auto	= sizeof(struct dm_spi_bus),
+	.per_child_auto	= sizeof(struct spi_slave),
+	.per_child_platdata_auto	=
 			sizeof(struct dm_spi_slave_platdata),
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.child_post_bind = spi_child_post_bind,
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index a53b941410d..44317780eba 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -541,6 +541,6 @@  U_BOOT_DRIVER(stm32_qspi) = {
 	.id = UCLASS_SPI,
 	.of_match = stm32_qspi_ids,
 	.ops = &stm32_qspi_ops,
-	.priv_auto_alloc_size = sizeof(struct stm32_qspi_priv),
+	.priv_auto	= sizeof(struct stm32_qspi_priv),
 	.probe = stm32_qspi_probe,
 };
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 4a0833b6fa9..4c7fee6fbb1 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -615,7 +615,7 @@  U_BOOT_DRIVER(stm32_spi) = {
 	.id			= UCLASS_SPI,
 	.of_match		= stm32_spi_ids,
 	.ops			= &stm32_spi_ops,
-	.priv_auto_alloc_size	= sizeof(struct stm32_spi_priv),
+	.priv_auto	= sizeof(struct stm32_spi_priv),
 	.probe			= stm32_spi_probe,
 	.remove			= stm32_spi_remove,
 };
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index 0c99dfde201..86fc38e5ece 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -394,7 +394,7 @@  U_BOOT_DRIVER(tegra114_spi) = {
 	.of_match = tegra114_spi_ids,
 	.ops	= &tegra114_spi_ops,
 	.ofdata_to_platdata = tegra114_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra114_spi_priv),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra114_spi_priv),
 	.probe	= tegra114_spi_probe,
 };
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 722a1203462..7e0cb2b1f86 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -354,7 +354,7 @@  U_BOOT_DRIVER(tegra20_sflash) = {
 	.of_match = tegra20_sflash_ids,
 	.ops	= &tegra20_sflash_ops,
 	.ofdata_to_platdata = tegra20_sflash_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra20_sflash_priv),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra20_sflash_priv),
 	.probe	= tegra20_sflash_probe,
 };
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index d051e93c533..bfb7fd14b2c 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -373,7 +373,7 @@  U_BOOT_DRIVER(tegra30_spi) = {
 	.of_match = tegra30_spi_ids,
 	.ops	= &tegra30_spi_ops,
 	.ofdata_to_platdata = tegra30_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra30_spi_priv),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra30_spi_priv),
 	.probe	= tegra30_spi_probe,
 };
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index ce08637c711..d8b2c73a664 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -423,8 +423,8 @@  U_BOOT_DRIVER(tegra210_qspi) = {
 	.of_match = tegra210_qspi_ids,
 	.ops = &tegra210_qspi_ops,
 	.ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct tegra210_qspi_priv),
-	.per_child_auto_alloc_size = sizeof(struct spi_slave),
+	.platdata_auto	= sizeof(struct tegra_spi_platdata),
+	.priv_auto	= sizeof(struct tegra210_qspi_priv),
+	.per_child_auto	= sizeof(struct spi_slave),
 	.probe = tegra210_qspi_probe,
 };
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 5fdbb494420..77353ba3752 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -505,6 +505,6 @@  U_BOOT_DRIVER(ti_qspi) = {
 	.of_match = ti_qspi_ids,
 	.ops	= &ti_qspi_ops,
 	.ofdata_to_platdata = ti_qspi_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ti_qspi_priv),
+	.priv_auto	= sizeof(struct ti_qspi_priv),
 	.probe	= ti_qspi_probe,
 };
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index b6456685f8d..048d74f1f89 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -412,7 +412,7 @@  U_BOOT_DRIVER(uniphier_spi) = {
 	.of_match = uniphier_spi_ids,
 	.ops	= &uniphier_spi_ops,
 	.ofdata_to_platdata = uniphier_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct uniphier_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct uniphier_spi_priv),
+	.platdata_auto	= sizeof(struct uniphier_spi_platdata),
+	.priv_auto	= sizeof(struct uniphier_spi_priv),
 	.probe	= uniphier_spi_probe,
 };
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 5b630073401..6c956850c51 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -364,6 +364,6 @@  U_BOOT_DRIVER(xilinx_spi) = {
 	.id	= UCLASS_SPI,
 	.of_match = xilinx_spi_ids,
 	.ops	= &xilinx_spi_ops,
-	.priv_auto_alloc_size = sizeof(struct xilinx_spi_priv),
+	.priv_auto	= sizeof(struct xilinx_spi_priv),
 	.probe	= xilinx_spi_probe,
 };
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 7e2d4e088ee..81059d3aa27 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -667,7 +667,7 @@  U_BOOT_DRIVER(zynq_qspi) = {
 	.of_match = zynq_qspi_ids,
 	.ops    = &zynq_qspi_ops,
 	.ofdata_to_platdata = zynq_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynq_qspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynq_qspi_priv),
+	.platdata_auto	= sizeof(struct zynq_qspi_platdata),
+	.priv_auto	= sizeof(struct zynq_qspi_priv),
 	.probe  = zynq_qspi_probe,
 };
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index ad7cec86e44..5623d98bfbd 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -372,7 +372,7 @@  U_BOOT_DRIVER(zynq_spi) = {
 	.of_match = zynq_spi_ids,
 	.ops	= &zynq_spi_ops,
 	.ofdata_to_platdata = zynq_spi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynq_spi_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynq_spi_priv),
+	.platdata_auto	= sizeof(struct zynq_spi_platdata),
+	.priv_auto	= sizeof(struct zynq_spi_priv),
 	.probe	= zynq_spi_probe,
 };
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index e0e66870377..4585222507b 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -728,7 +728,7 @@  U_BOOT_DRIVER(zynqmp_qspi) = {
 	.of_match = zynqmp_qspi_ids,
 	.ops    = &zynqmp_qspi_ops,
 	.ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct zynqmp_qspi_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynqmp_qspi_priv),
+	.platdata_auto	= sizeof(struct zynqmp_qspi_platdata),
+	.priv_auto	= sizeof(struct zynqmp_qspi_priv),
 	.probe  = zynqmp_qspi_probe,
 };
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 2f430aed9cb..7f21443f6ae 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -194,5 +194,5 @@  U_BOOT_DRIVER(msm_spmi) = {
 	.of_match = msm_spmi_ids,
 	.ops = &msm_spmi_ops,
 	.probe = msm_spmi_probe,
-	.priv_auto_alloc_size = sizeof(struct msm_spmi_priv),
+	.priv_auto	= sizeof(struct msm_spmi_priv),
 };
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index 0da419c5052..f6772946bca 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -151,5 +151,5 @@  U_BOOT_DRIVER(msm_spmi) = {
 	.of_match = sandbox_spmi_ids,
 	.ops = &sandbox_spmi_ops,
 	.probe = sandbox_spmi_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_spmi_priv),
+	.priv_auto	= sizeof(struct sandbox_spmi_priv),
 };
diff --git a/drivers/sysinfo/gazerbeam.c b/drivers/sysinfo/gazerbeam.c
index 9e7a4966554..c1fae6ccf2a 100644
--- a/drivers/sysinfo/gazerbeam.c
+++ b/drivers/sysinfo/gazerbeam.c
@@ -260,6 +260,6 @@  U_BOOT_DRIVER(sysinfo_gazerbeam) = {
 	.id             = UCLASS_SYSINFO,
 	.of_match       = sysinfo_gazerbeam_ids,
 	.ops		= &sysinfo_gazerbeam_ops,
-	.priv_auto_alloc_size = sizeof(struct sysinfo_gazerbeam_priv),
+	.priv_auto	= sizeof(struct sysinfo_gazerbeam_priv),
 	.probe          = sysinfo_gazerbeam_probe,
 };
diff --git a/drivers/sysinfo/sandbox.c b/drivers/sysinfo/sandbox.c
index 62a1cb4ac65..d270a26aa43 100644
--- a/drivers/sysinfo/sandbox.c
+++ b/drivers/sysinfo/sandbox.c
@@ -102,6 +102,6 @@  U_BOOT_DRIVER(sysinfo_sandbox) = {
 	.id             = UCLASS_SYSINFO,
 	.of_match       = sysinfo_sandbox_ids,
 	.ops		= &sysinfo_sandbox_ops,
-	.priv_auto_alloc_size = sizeof(struct sysinfo_sandbox_priv),
+	.priv_auto	= sizeof(struct sysinfo_sandbox_priv),
 	.probe          = sysinfo_sandbox_probe,
 };
diff --git a/drivers/sysreset/poweroff_gpio.c b/drivers/sysreset/poweroff_gpio.c
index ac482c37f48..a5c24fd85bc 100644
--- a/drivers/sysreset/poweroff_gpio.c
+++ b/drivers/sysreset/poweroff_gpio.c
@@ -87,6 +87,6 @@  U_BOOT_DRIVER(poweroff_gpio) = {
 	.id		= UCLASS_SYSRESET,
 	.ops		= &poweroff_gpio_ops,
 	.probe		= poweroff_gpio_probe,
-	.priv_auto_alloc_size = sizeof(struct poweroff_gpio_info),
+	.priv_auto	= sizeof(struct poweroff_gpio_info),
 	.of_match	= poweroff_gpio_ids,
 };
diff --git a/drivers/sysreset/sysreset-ti-sci.c b/drivers/sysreset/sysreset-ti-sci.c
index 7707c72bb5e..81bfd67ad99 100644
--- a/drivers/sysreset/sysreset-ti-sci.c
+++ b/drivers/sysreset/sysreset-ti-sci.c
@@ -70,6 +70,6 @@  U_BOOT_DRIVER(ti_sci_sysreset) = {
 	.id = UCLASS_SYSRESET,
 	.of_match = ti_sci_sysreset_of_match,
 	.probe = ti_sci_sysreset_probe,
-	.priv_auto_alloc_size = sizeof(struct ti_sci_sysreset_data),
+	.priv_auto	= sizeof(struct ti_sci_sysreset_data),
 	.ops = &ti_sci_sysreset_ops,
 };
diff --git a/drivers/sysreset/sysreset_gpio.c b/drivers/sysreset/sysreset_gpio.c
index d7280eeda86..680b759eb3c 100644
--- a/drivers/sysreset/sysreset_gpio.c
+++ b/drivers/sysreset/sysreset_gpio.c
@@ -55,6 +55,6 @@  U_BOOT_DRIVER(gpio_reboot) = {
 	.name = "gpio_restart",
 	.of_match = led_gpio_ids,
 	.ops = &gpio_reboot_ops,
-	.priv_auto_alloc_size = sizeof(struct gpio_reboot_priv),
+	.priv_auto	= sizeof(struct gpio_reboot_priv),
 	.probe = gpio_reboot_probe,
 };
diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c
index a05dac3226e..ebdea6ab66e 100644
--- a/drivers/sysreset/sysreset_octeon.c
+++ b/drivers/sysreset/sysreset_octeon.c
@@ -45,7 +45,7 @@  static const struct udevice_id octeon_sysreset_ids[] = {
 U_BOOT_DRIVER(sysreset_octeon) = {
 	.id	= UCLASS_SYSRESET,
 	.name	= "octeon_sysreset",
-	.priv_auto_alloc_size = sizeof(struct octeon_sysreset_data),
+	.priv_auto	= sizeof(struct octeon_sysreset_data),
 	.ops	= &octeon_sysreset,
 	.probe	= octeon_sysreset_probe,
 	.of_match = octeon_sysreset_ids,
diff --git a/drivers/sysreset/sysreset_resetctl.c b/drivers/sysreset/sysreset_resetctl.c
index b8203ba6059..c039521eb43 100644
--- a/drivers/sysreset/sysreset_resetctl.c
+++ b/drivers/sysreset/sysreset_resetctl.c
@@ -43,6 +43,6 @@  U_BOOT_DRIVER(resetctl_reboot) = {
 	.name = "resetctl_reboot",
 	.of_match = resetctl_reboot_ids,
 	.ops = &resetctl_reboot_ops,
-	.priv_auto_alloc_size = sizeof(struct resetctl_reboot_priv),
+	.priv_auto	= sizeof(struct resetctl_reboot_priv),
 	.probe = resetctl_reboot_probe,
 };
diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c
index 67cec6563a2..e38296ac3f3 100644
--- a/drivers/sysreset/sysreset_socfpga.c
+++ b/drivers/sysreset/sysreset_socfpga.c
@@ -51,7 +51,7 @@  static struct sysreset_ops socfpga_sysreset = {
 U_BOOT_DRIVER(sysreset_socfpga) = {
 	.id	= UCLASS_SYSRESET,
 	.name	= "socfpga_sysreset",
-	.priv_auto_alloc_size = sizeof(struct socfpga_sysreset_data),
+	.priv_auto	= sizeof(struct socfpga_sysreset_data),
 	.ops	= &socfpga_sysreset,
 	.probe	= socfpga_sysreset_probe,
 };
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 3482d2a0787..2e9b713368a 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -79,5 +79,5 @@  U_BOOT_DRIVER(sysreset_sti) = {
 	.ops = &sti_sysreset,
 	.probe = sti_sysreset_probe,
 	.of_match = sti_sysreset_ids,
-	.priv_auto_alloc_size = sizeof(struct sti_sysreset_priv),
+	.priv_auto	= sizeof(struct sti_sysreset_priv),
 };
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 1c474866145..28fdfb09781 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -87,6 +87,6 @@  U_BOOT_DRIVER(syscon_reboot) = {
 	.id = UCLASS_SYSRESET,
 	.of_match = syscon_reboot_ids,
 	.probe = syscon_reboot_probe,
-	.priv_auto_alloc_size = sizeof(struct syscon_reboot_priv),
+	.priv_auto	= sizeof(struct syscon_reboot_priv),
 	.ops = &syscon_reboot_ops,
 };
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c
index d500d413261..0dc2d8b9b65 100644
--- a/drivers/sysreset/sysreset_watchdog.c
+++ b/drivers/sysreset/sysreset_watchdog.c
@@ -54,6 +54,6 @@  U_BOOT_DRIVER(wdt_reboot) = {
 	.id = UCLASS_SYSRESET,
 	.of_match = wdt_reboot_ids,
 	.ops = &wdt_reboot_ops,
-	.priv_auto_alloc_size = sizeof(struct wdt_reboot_priv),
+	.priv_auto	= sizeof(struct wdt_reboot_priv),
 	.probe = wdt_reboot_probe,
 };
diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
index 7682ffbd294..5c3dd35cfb2 100644
--- a/drivers/sysreset/sysreset_x86.c
+++ b/drivers/sysreset/sysreset_x86.c
@@ -154,5 +154,5 @@  U_BOOT_DRIVER(x86_reset) = {
 	.of_match = x86_sysreset_ids,
 	.ops = &x86_sysreset_ops,
 	.probe = x86_sysreset_probe,
-	.platdata_auto_alloc_size	= sizeof(struct x86_sysreset_platdata),
+	.platdata_auto	= sizeof(struct x86_sysreset_platdata),
 };
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 66ade37cd40..142bf17668a 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -661,6 +661,6 @@  U_BOOT_DRIVER(optee) = {
 	.ofdata_to_platdata = optee_ofdata_to_platdata,
 	.probe = optee_probe,
 	.ops = &optee_ops,
-	.platdata_auto_alloc_size = sizeof(struct optee_pdata),
-	.priv_auto_alloc_size = sizeof(struct optee_private),
+	.platdata_auto	= sizeof(struct optee_pdata),
+	.priv_auto	= sizeof(struct optee_private),
 };
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 4b91e7db1bc..e1ba027fd6e 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -385,7 +385,7 @@  U_BOOT_DRIVER(sandbox_tee) = {
 	.id = UCLASS_TEE,
 	.of_match = sandbox_tee_match,
 	.ops = &sandbox_tee_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_tee_state),
+	.priv_auto	= sizeof(struct sandbox_tee_state),
 	.probe = sandbox_tee_probe,
 	.remove = sandbox_tee_remove,
 };
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 112e2168834..2cc6b6c407d 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -205,7 +205,7 @@  static int tee_pre_remove(struct udevice *dev)
 UCLASS_DRIVER(tee) = {
 	.id = UCLASS_TEE,
 	.name = "tee",
-	.per_device_auto_alloc_size = sizeof(struct tee_uclass_priv),
+	.per_device_auto	= sizeof(struct tee_uclass_priv),
 	.pre_probe = tee_pre_probe,
 	.pre_remove = tee_pre_remove,
 };
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 83ec753802a..d76a3e01ecb 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -211,6 +211,6 @@  U_BOOT_DRIVER(imx_sc_thermal) = {
 	.bind = imx_sc_thermal_bind,
 	.probe	= imx_sc_thermal_probe,
 	.ofdata_to_platdata = imx_sc_thermal_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct imx_sc_thermal_plat),
+	.platdata_auto	= sizeof(struct imx_sc_thermal_plat),
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 101bd5ef2d7..8898268a574 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -274,6 +274,6 @@  U_BOOT_DRIVER(imx_thermal) = {
 	.id	= UCLASS_THERMAL,
 	.ops	= &imx_thermal_ops,
 	.probe	= imx_thermal_probe,
-	.priv_auto_alloc_size = sizeof(struct thermal_data),
+	.priv_auto	= sizeof(struct thermal_data),
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 936068c6cba..4c8371771c9 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -463,6 +463,6 @@  U_BOOT_DRIVER(imx_tmu) = {
 	.of_match = imx_tmu_ids,
 	.bind = imx_tmu_bind,
 	.probe	= imx_tmu_probe,
-	.platdata_auto_alloc_size = sizeof(struct imx_tmu_plat),
+	.platdata_auto	= sizeof(struct imx_tmu_plat),
 	.flags  = DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/thermal/ti-bandgap.c b/drivers/thermal/ti-bandgap.c
index 8b332f116c3..0b533d4c420 100644
--- a/drivers/thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-bandgap.c
@@ -194,5 +194,5 @@  U_BOOT_DRIVER(ti_bandgap_thermal) = {
 	.ops	= &ti_thermal_ops,
 	.probe	= ti_bandgap_probe,
 	.of_match = of_ti_bandgap_match,
-	.priv_auto_alloc_size = sizeof(struct ti_bandgap),
+	.priv_auto	= sizeof(struct ti_bandgap),
 };
diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index 23ad5b2b67a..f014ed65795 100644
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -111,7 +111,7 @@  U_BOOT_DRIVER(altera_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = ag101p_timer_ids,
 	.ofdata_to_platdata = atftme_timer_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata),
+	.platdata_auto	= sizeof(struct atftmr_timer_platdata),
 	.probe = atftmr_timer_probe,
 	.ops	= &ag101p_timer_ops,
 };
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index ccc164ee176..ad50380f04d 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -88,7 +88,7 @@  U_BOOT_DRIVER(altera_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = altera_timer_ids,
 	.ofdata_to_platdata = altera_timer_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct altera_timer_platdata),
+	.platdata_auto	= sizeof(struct altera_timer_platdata),
 	.probe = altera_timer_probe,
 	.ops	= &altera_timer_ops,
 };
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 2dea9f40cba..904950457c7 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -105,5 +105,5 @@  U_BOOT_DRIVER(arc_timer) = {
 	.of_match = arc_timer_ids,
 	.probe = arc_timer_probe,
 	.ops	= &arc_timer_ops,
-	.priv_auto_alloc_size = sizeof(struct arc_timer_priv),
+	.priv_auto	= sizeof(struct arc_timer_priv),
 };
diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c
index 35369a4087f..9ad446054ec 100644
--- a/drivers/timer/ast_timer.c
+++ b/drivers/timer/ast_timer.c
@@ -86,7 +86,7 @@  U_BOOT_DRIVER(ast_timer) = {
 	.id = UCLASS_TIMER,
 	.of_match = ast_timer_ids,
 	.probe = ast_timer_probe,
-	.priv_auto_alloc_size = sizeof(struct ast_timer_priv),
+	.priv_auto	= sizeof(struct ast_timer_priv),
 	.ofdata_to_platdata = ast_timer_ofdata_to_platdata,
 	.ops = &ast_timer_ops,
 };
diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c
index fcb8a453581..e574eabebc0 100644
--- a/drivers/timer/atcpit100_timer.c
+++ b/drivers/timer/atcpit100_timer.c
@@ -106,7 +106,7 @@  U_BOOT_DRIVER(atcpit100_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = atcpit_timer_ids,
 	.ofdata_to_platdata = atcpit_timer_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct atcpit_timer_platdata),
+	.platdata_auto	= sizeof(struct atcpit_timer_platdata),
 	.probe = atcpit_timer_probe,
 	.ops	= &atcpit_timer_ops,
 };
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 9f0ad1d703f..a0daf49dad2 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -81,7 +81,7 @@  U_BOOT_DRIVER(atmel_pit) = {
 	.id	= UCLASS_TIMER,
 	.of_match = atmel_pit_ids,
 	.ofdata_to_platdata = atmel_pit_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct atmel_pit_platdata),
+	.platdata_auto	= sizeof(struct atmel_pit_platdata),
 	.probe	= atmel_pit_probe,
 	.ops	= &atmel_pit_ops,
 };
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index bebb2c2e904..7107bf2472a 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -110,7 +110,7 @@  U_BOOT_DRIVER(cadence_ttc) = {
 	.id = UCLASS_TIMER,
 	.of_match = cadence_ttc_ids,
 	.ofdata_to_platdata = cadence_ttc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct cadence_ttc_priv),
+	.priv_auto	= sizeof(struct cadence_ttc_priv),
 	.probe = cadence_ttc_probe,
 	.ops = &cadence_ttc_ops,
 };
diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c
index 68bc258131b..8ef36d4c2b6 100644
--- a/drivers/timer/dw-apb-timer.c
+++ b/drivers/timer/dw-apb-timer.c
@@ -99,5 +99,5 @@  U_BOOT_DRIVER(dw_apb_timer) = {
 	.of_match	= dw_apb_timer_ids,
 	.ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata,
 	.remove		= dw_apb_timer_remove,
-	.priv_auto_alloc_size = sizeof(struct dw_apb_timer_priv),
+	.priv_auto	= sizeof(struct dw_apb_timer_priv),
 };
diff --git a/drivers/timer/mchp-pit64b-timer.c b/drivers/timer/mchp-pit64b-timer.c
index ad962098b3d..c9806d7eeeb 100644
--- a/drivers/timer/mchp-pit64b-timer.c
+++ b/drivers/timer/mchp-pit64b-timer.c
@@ -100,7 +100,7 @@  U_BOOT_DRIVER(mchp_pit64b) = {
 	.name	= "mchp-pit64b",
 	.id	= UCLASS_TIMER,
 	.of_match = mchp_pit64b_ids,
-	.priv_auto_alloc_size = sizeof(struct mchp_pit64b_priv),
+	.priv_auto	= sizeof(struct mchp_pit64b_priv),
 	.probe	= mchp_pit64b_probe,
 	.ops	= &mchp_pit64b_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 6139252a73c..9b1daaadebf 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -244,5 +244,5 @@  U_BOOT_DRIVER(mpc83xx_timer) = {
 	.of_match = mpc83xx_timer_ids,
 	.probe = mpc83xx_timer_probe,
 	.ops	= &mpc83xx_timer_ops,
-	.priv_auto_alloc_size = sizeof(struct mpc83xx_timer_priv),
+	.priv_auto	= sizeof(struct mpc83xx_timer_priv),
 };
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 74e9ea34ffa..448a76a7e1f 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -78,7 +78,7 @@  U_BOOT_DRIVER(mtk_timer) = {
 	.name = "mtk_timer",
 	.id = UCLASS_TIMER,
 	.of_match = mtk_timer_ids,
-	.priv_auto_alloc_size = sizeof(struct mtk_timer_priv),
+	.priv_auto	= sizeof(struct mtk_timer_priv),
 	.probe = mtk_timer_probe,
 	.ops = &mtk_timer_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index d7f7ca4effd..417b419d467 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -107,7 +107,7 @@  U_BOOT_DRIVER(nomadik_mtu) = {
 	.name = "nomadik_mtu",
 	.id = UCLASS_TIMER,
 	.of_match = nomadik_mtu_ids,
-	.priv_auto_alloc_size = sizeof(struct nomadik_mtu_priv),
+	.priv_auto	= sizeof(struct nomadik_mtu_priv),
 	.probe = nomadik_mtu_probe,
 	.ops = &nomadik_mtu_ops,
 };
diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c
index 4eecb3e64d2..a1029ac5061 100644
--- a/drivers/timer/omap-timer.c
+++ b/drivers/timer/omap-timer.c
@@ -100,7 +100,7 @@  U_BOOT_DRIVER(omap_timer) = {
 	.id	= UCLASS_TIMER,
 	.of_match = omap_timer_ids,
 	.ofdata_to_platdata = omap_timer_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct omap_timer_priv),
+	.priv_auto	= sizeof(struct omap_timer_priv),
 	.probe = omap_timer_probe,
 	.ops	= &omap_timer_ops,
 };
diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c
index bb0636a0719..261cac5de38 100644
--- a/drivers/timer/ostm_timer.c
+++ b/drivers/timer/ostm_timer.c
@@ -88,5 +88,5 @@  U_BOOT_DRIVER(ostm_timer) = {
 	.probe		= ostm_probe,
 	.of_match	= ostm_ids,
 	.ofdata_to_platdata = ostm_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct ostm_priv),
+	.priv_auto	= sizeof(struct ostm_priv),
 };
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 53cdf09810d..dab6b12782e 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -165,9 +165,9 @@  U_BOOT_DRIVER(rockchip_rk3368_timer) = {
 	.of_match = rockchip_timer_ids,
 	.probe = rockchip_timer_probe,
 	.ops	= &rockchip_timer_ops,
-	.priv_auto_alloc_size = sizeof(struct rockchip_timer_priv),
+	.priv_auto	= sizeof(struct rockchip_timer_priv),
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-	.platdata_auto_alloc_size = sizeof(struct rockchip_timer_plat),
+	.platdata_auto	= sizeof(struct rockchip_timer_plat),
 #endif
 	.ofdata_to_platdata = rockchip_clk_ofdata_to_platdata,
 };
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index e6843ebb337..1ab183c143c 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -79,7 +79,7 @@  U_BOOT_DRIVER(sti_timer) = {
 	.name = "sti_timer",
 	.id = UCLASS_TIMER,
 	.of_match = sti_timer_ids,
-	.priv_auto_alloc_size = sizeof(struct sti_timer_priv),
+	.priv_auto	= sizeof(struct sti_timer_priv),
 	.probe = sti_timer_probe,
 	.ops = &sti_timer_ops,
 };
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index f517d5e61f2..1b47e90f8c9 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -129,7 +129,7 @@  U_BOOT_DRIVER(stm32_timer) = {
 	.name = "stm32_timer",
 	.id = UCLASS_TIMER,
 	.of_match = stm32_timer_ids,
-	.priv_auto_alloc_size = sizeof(struct stm32_timer_priv),
+	.priv_auto	= sizeof(struct stm32_timer_priv),
 	.probe = stm32_timer_probe,
 	.ops = &stm32_timer_ops,
 };
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 62d0e860e80..f25f5613d4c 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -176,5 +176,5 @@  UCLASS_DRIVER(timer) = {
 	.pre_probe	= timer_pre_probe,
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_probe	= timer_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct timer_dev_priv),
+	.per_device_auto	= sizeof(struct timer_dev_priv),
 };
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index a761e3d52f1..1dfc5c54f39 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -728,7 +728,7 @@  U_BOOT_DRIVER(cr50_i2c) = {
 	.ofdata_to_platdata	= cr50_i2c_ofdata_to_platdata,
 	.probe	= cr50_i2c_probe,
 	.remove	= cr50_i2c_cleanup,
-	.priv_auto_alloc_size = sizeof(struct cr50_priv),
+	.priv_auto	= sizeof(struct cr50_priv),
 	ACPI_OPS_PTR(&cr50_acpi_ops)
 	.flags		= DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 6ea795bc0c9..beb0fa3f93c 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -141,5 +141,5 @@  UCLASS_DRIVER(tpm) = {
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.post_bind	= dm_scan_fdt_dev,
 #endif
-	.per_device_auto_alloc_size	= sizeof(struct tpm_chip_priv),
+	.per_device_auto	= sizeof(struct tpm_chip_priv),
 };
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 3197e0ebcd3..53e59f42b4f 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -247,5 +247,5 @@  U_BOOT_DRIVER(ftpm_tee) = {
 	.probe	= ftpm_tee_probe,
 	.remove	= ftpm_tee_remove,
 	.flags	= DM_FLAG_OS_PREPARE,
-	.priv_auto_alloc_size = sizeof(struct ftpm_tee_private),
+	.priv_auto	= sizeof(struct ftpm_tee_private),
 };
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 41a15bd49fb..c74bacfd719 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -625,5 +625,5 @@  U_BOOT_DRIVER(sandbox_tpm2) = {
 	.of_match = sandbox_tpm2_ids,
 	.ops    = &sandbox_tpm2_ops,
 	.probe	= sandbox_tpm2_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_tpm2),
+	.priv_auto	= sizeof(struct sandbox_tpm2),
 };
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 0045bedf0c6..4b33ac8fd3d 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -686,5 +686,5 @@  U_BOOT_DRIVER(tpm_tis_spi) = {
 	.ops    = &tpm_tis_spi_ops,
 	.probe	= tpm_tis_spi_probe,
 	.remove	= tpm_tis_spi_remove,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
+	.priv_auto	= sizeof(struct tpm_chip),
 };
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index f47813e76d0..f414e5657db 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -633,5 +633,5 @@  U_BOOT_DRIVER(tpm_tis_i2c) = {
 	.of_match = tpm_tis_i2c_ids,
 	.ops    = &tpm_tis_i2c_ops,
 	.probe	= tpm_tis_i2c_probe,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
+	.priv_auto	= sizeof(struct tpm_chip),
 };
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 2dd374cf77d..003c0d8816d 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -475,5 +475,5 @@  U_BOOT_DRIVER(tpm_tis_lpc) = {
 	.of_match = tpm_tis_lpc_ids,
 	.ops    = &tpm_tis_lpc_ops,
 	.probe	= tpm_tis_lpc_probe,
-	.priv_auto_alloc_size = sizeof(struct tpm_tis_lpc_priv),
+	.priv_auto	= sizeof(struct tpm_tis_lpc_priv),
 };
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index e167d0a2fe3..67139cea3be 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -361,5 +361,5 @@  U_BOOT_DRIVER(google_sandbox_tpm) = {
 	.of_match = sandbox_tpm_ids,
 	.ops    = &sandbox_tpm_ops,
 	.probe	= sandbox_tpm_probe,
-	.priv_auto_alloc_size = sizeof(struct tpm_state),
+	.priv_auto	= sizeof(struct tpm_state),
 };
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index a253ee15027..e0eeabb9337 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -542,5 +542,5 @@  U_BOOT_DRIVER(st33zp24_i2c) = {
 	.probe  = st33zp24_i2c_probe,
 	.remove = st33zp24_i2c_remove,
 	.ops = &st33zp24_i2c_tpm_ops,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
+	.priv_auto	= sizeof(struct tpm_chip),
 };
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index ef54e3b7b29..683d49689a3 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -670,6 +670,6 @@  U_BOOT_DRIVER(st33zp24_spi_spi) = {
 	.probe  = st33zp24_spi_probe,
 	.remove = st33zp24_spi_remove,
 	.ops = &st33zp24_spi_tpm_ops,
-	.priv_auto_alloc_size = sizeof(struct tpm_chip),
-	.platdata_auto_alloc_size = sizeof(struct st33zp24_spi_phy),
+	.priv_auto	= sizeof(struct tpm_chip),
+	.platdata_auto	= sizeof(struct st33zp24_spi_phy),
 };
diff --git a/drivers/ufs/ufs-uclass.c b/drivers/ufs/ufs-uclass.c
index 920bfa64e19..034d14fd8da 100644
--- a/drivers/ufs/ufs-uclass.c
+++ b/drivers/ufs/ufs-uclass.c
@@ -12,5 +12,5 @@ 
 UCLASS_DRIVER(ufs) = {
 	.id	= UCLASS_UFS,
 	.name	= "ufs",
-	.per_device_auto_alloc_size = sizeof(struct ufs_hba),
+	.per_device_auto	= sizeof(struct ufs_hba),
 };
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index cd7b2113ace..d156164761a 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -190,6 +190,6 @@  U_BOOT_DRIVER(cdns_ti) = {
 	.bind = cdns3_bind,
 	.probe = cdns_ti_probe,
 	.remove = cdns_ti_remove,
-	.platdata_auto_alloc_size = sizeof(struct cdns_ti),
+	.platdata_auto	= sizeof(struct cdns_ti),
 	.flags = DM_FLAG_OS_PREPARE,
 };
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index ea86a250608..e861c82f7e1 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -461,7 +461,7 @@  U_BOOT_DRIVER(cdns_usb3_peripheral) = {
 	.of_match = cdns3_ids,
 	.probe = cdns3_gadget_probe,
 	.remove = cdns3_gadget_remove,
-	.priv_auto_alloc_size = sizeof(struct cdns3_gadget_priv),
+	.priv_auto	= sizeof(struct cdns3_gadget_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
@@ -492,7 +492,7 @@  U_BOOT_DRIVER(cdns_usb3_host) = {
 	.of_match = cdns3_ids,
 	.probe = cdns3_host_probe,
 	.remove = cdns3_host_remove,
-	.priv_auto_alloc_size = sizeof(struct cdns3_host_priv),
+	.priv_auto	= sizeof(struct cdns3_host_priv),
 	.ops = &xhci_usb_ops,
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index a936f71d2e5..fb09b3ab1ed 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -158,8 +158,8 @@  U_BOOT_DRIVER(dwc3_generic_peripheral) = {
 	.ofdata_to_platdata = dwc3_generic_ofdata_to_platdata,
 	.probe = dwc3_generic_peripheral_probe,
 	.remove = dwc3_generic_peripheral_remove,
-	.priv_auto_alloc_size = sizeof(struct dwc3_generic_priv),
-	.platdata_auto_alloc_size = sizeof(struct dwc3_generic_plat),
+	.priv_auto	= sizeof(struct dwc3_generic_priv),
+	.platdata_auto	= sizeof(struct dwc3_generic_plat),
 };
 #endif
 
@@ -200,8 +200,8 @@  U_BOOT_DRIVER(dwc3_generic_host) = {
 	.ofdata_to_platdata = dwc3_generic_ofdata_to_platdata,
 	.probe = dwc3_generic_host_probe,
 	.remove = dwc3_generic_host_remove,
-	.priv_auto_alloc_size = sizeof(struct dwc3_generic_host_priv),
-	.platdata_auto_alloc_size = sizeof(struct dwc3_generic_plat),
+	.priv_auto	= sizeof(struct dwc3_generic_host_priv),
+	.platdata_auto	= sizeof(struct dwc3_generic_plat),
 	.ops = &xhci_usb_ops,
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
@@ -459,6 +459,6 @@  U_BOOT_DRIVER(dwc3_generic_wrapper) = {
 	.bind = dwc3_glue_bind,
 	.probe = dwc3_glue_probe,
 	.remove = dwc3_glue_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_glue_data),
+	.platdata_auto	= sizeof(struct dwc3_glue_data),
 
 };
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 6567502cdd1..58d57ee7d1b 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -469,6 +469,6 @@  U_BOOT_DRIVER(dwc3_generic_wrapper) = {
 	.of_match = dwc3_meson_g12a_ids,
 	.probe = dwc3_meson_g12a_probe,
 	.remove = dwc3_meson_g12a_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_meson_g12a),
+	.platdata_auto	= sizeof(struct dwc3_meson_g12a),
 
 };
diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c
index 92ee0866f7e..6e8c93a0fea 100644
--- a/drivers/usb/dwc3/dwc3-meson-gxl.c
+++ b/drivers/usb/dwc3/dwc3-meson-gxl.c
@@ -420,6 +420,6 @@  U_BOOT_DRIVER(dwc3_generic_wrapper) = {
 	.of_match = dwc3_meson_gxl_ids,
 	.probe = dwc3_meson_gxl_probe,
 	.remove = dwc3_meson_gxl_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_meson_gxl),
+	.platdata_auto	= sizeof(struct dwc3_meson_gxl),
 
 };
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),
 };
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index ac4a27fff20..7115dcb56fc 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -876,8 +876,8 @@  U_BOOT_DRIVER(asix_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = asix_eth_probe,
 	.ops	= &asix_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct asix_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct asix_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id asix_eth_id_table[] = {
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index c142b8b19bf..ffc90c00ab3 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -902,8 +902,8 @@  U_BOOT_DRIVER(ax88179_eth) = {
 	.id = UCLASS_ETH,
 	.probe = ax88179_eth_probe,
 	.ops = &ax88179_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct asix_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct asix_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id ax88179_eth_id_table[] = {
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 46b92e8d68b..1fa7e534040 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -304,8 +304,8 @@  U_BOOT_DRIVER(lan75xx_eth) = {
 	.probe	= lan75xx_eth_probe,
 	.remove	= lan7x_eth_remove,
 	.ops	= &lan75xx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct lan7x_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct lan7x_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id lan75xx_eth_id_table[] = {
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index e34ad2603fb..3f7e03f51c5 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -466,8 +466,8 @@  U_BOOT_DRIVER(lan78xx_eth) = {
 	.probe	= lan78xx_eth_probe,
 	.remove	= lan7x_eth_remove,
 	.ops	= &lan78xx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct lan7x_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct lan7x_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id lan78xx_eth_id_table[] = {
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index c829a436a34..1746819192c 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -928,8 +928,8 @@  U_BOOT_DRIVER(mcs7830_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = mcs7830_eth_probe,
 	.ops	= &mcs7830_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct mcs7830_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct mcs7830_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 215bcbbef80..804c331ee1b 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -1842,8 +1842,8 @@  U_BOOT_DRIVER(r8152_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = r8152_eth_probe,
 	.ops	= &r8152_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct r8152),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct r8152),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id r8152_eth_id_table[] = {
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index b293a808a3d..d6863ad89e4 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -1062,8 +1062,8 @@  U_BOOT_DRIVER(smsc95xx_eth) = {
 	.id	= UCLASS_ETH,
 	.probe = smsc95xx_eth_probe,
 	.ops	= &smsc95xx_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct smsc95xx_private),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct smsc95xx_private),
+	.platdata_auto	= sizeof(struct eth_pdata),
 };
 
 static const struct usb_device_id smsc95xx_eth_id_table[] = {
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 8a8e2179e48..a662d500d39 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -1189,8 +1189,8 @@  U_BOOT_DRIVER(dwc2_udc_otg) = {
 	.ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata,
 	.probe = dwc2_udc_otg_probe,
 	.remove = dwc2_udc_otg_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc2_plat_otg_data),
-	.priv_auto_alloc_size = sizeof(struct dwc2_priv_data),
+	.platdata_auto	= sizeof(struct dwc2_plat_otg_data),
+	.priv_auto	= sizeof(struct dwc2_priv_data),
 };
 
 int dwc2_udc_B_session_valid(struct udevice *dev)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a8e8bfc04b4..0cce8e24c50 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2691,8 +2691,8 @@  U_BOOT_DRIVER(eth_usb) = {
 	.id	= UCLASS_ETH,
 	.probe	= usb_eth_probe,
 	.ops	= &usb_eth_ops,
-	.priv_auto_alloc_size = sizeof(struct ether_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct ether_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* CONFIG_DM_ETH */
diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c
index 156bb1ebebd..c651eeb5e59 100644
--- a/drivers/usb/gadget/max3420_udc.c
+++ b/drivers/usb/gadget/max3420_udc.c
@@ -871,5 +871,5 @@  U_BOOT_DRIVER(max3420_generic_udc) = {
 	.of_match = max3420_ids,
 	.probe = max3420_udc_probe,
 	.remove = max3420_udc_remove,
-	.priv_auto_alloc_size = sizeof(struct max3420_udc),
+	.priv_auto	= sizeof(struct max3420_udc),
 };
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index f1d13b1c1df..40d389cbd6a 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -1477,7 +1477,7 @@  U_BOOT_DRIVER(usb_dwc2) = {
 	.probe	= dwc2_usb_probe,
 	.remove = dwc2_usb_remove,
 	.ops	= &dwc2_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct dwc2_priv),
+	.priv_auto	= sizeof(struct dwc2_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c
index e4abc6f3b9b..6240a453a08 100644
--- a/drivers/usb/host/dwc3-of-simple.c
+++ b/drivers/usb/host/dwc3-of-simple.c
@@ -102,6 +102,6 @@  U_BOOT_DRIVER(dwc3_of_simple) = {
 	.of_match = dwc3_of_simple_ids,
 	.probe = dwc3_of_simple_probe,
 	.remove = dwc3_of_simple_remove,
-	.platdata_auto_alloc_size = sizeof(struct dwc3_of_simple),
+	.platdata_auto	= sizeof(struct dwc3_of_simple),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 3e6c1429d66..ba008bf6866 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -246,6 +246,6 @@  U_BOOT_DRIVER(dwc3_sti_glue) = {
 	.probe = sti_dwc3_glue_probe,
 	.remove = sti_dwc3_glue_remove,
 	.bind = sti_dwc3_glue_bind,
-	.platdata_auto_alloc_size = sizeof(struct sti_dwc3_glue_platdata),
+	.platdata_auto	= sizeof(struct sti_dwc3_glue_platdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b208e8eb22..955cacdd981 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -124,8 +124,8 @@  U_BOOT_DRIVER(ehci_atmel) = {
 	.probe		= ehci_atmel_probe,
 	.remove		= ehci_deregister,
 	.ops		= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_atmel_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_atmel_priv),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 6a37c5d982a..3728b238d4e 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -258,7 +258,7 @@  U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct exynos_ehci),
-	.platdata_auto_alloc_size = sizeof(struct exynos_ehci_platdata),
+	.priv_auto	= sizeof(struct exynos_ehci),
+	.platdata_auto	= sizeof(struct exynos_ehci_platdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 5423d10abe7..a53493a617d 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -145,8 +145,8 @@  U_BOOT_DRIVER(ehci_fsl) = {
 	.probe = ehci_fsl_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_fsl_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_fsl_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #else
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index c93a7051a79..4c28a69b989 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -221,6 +221,6 @@  U_BOOT_DRIVER(ehci_generic) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct generic_ehci),
+	.priv_auto	= sizeof(struct generic_ehci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 62414bb1102..329593689f4 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -152,8 +152,8 @@  U_BOOT_DRIVER(ehci_mvebu) = {
 	.probe = ehci_mvebu_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_mvebu_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_mvebu_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index dd92808ff7b..61ff13e2b8e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -144,7 +144,7 @@  U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_usb_remove,
 	.ops	= &ehci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct msm_ehci_priv),
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct msm_ehci_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 51377487d4b..b1c2e7d3354 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -367,8 +367,8 @@  U_BOOT_DRIVER(usb_mx5) = {
 	.probe	= ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_mx5_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_mx5_priv_data),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif /* !CONFIG_IS_ENABLED(DM_USB) */
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index d7a6ee6d0e6..5bc1cf09f53 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -656,8 +656,8 @@  U_BOOT_DRIVER(usb_mx6) = {
 	.probe	= ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_mx6_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_mx6_priv_data),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index a2c0caf1bcc..1ed640605e3 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -403,8 +403,8 @@  U_BOOT_DRIVER(usb_omap_ehci) = {
 	.of_match = omap_ehci_dt_ids,
 	.probe = omap_ehci_probe,
 	.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_omap_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_omap_priv_data),
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 7dd5c33c13d..7d91846d079 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -163,8 +163,8 @@  U_BOOT_DRIVER(ehci_pci) = {
 	.remove = ehci_pci_remove,
 	.of_match = ehci_pci_ids,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_pci_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_pci_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index d81f4a03f14..9ffaf0060ab 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -865,7 +865,7 @@  U_BOOT_DRIVER(usb_ehci) = {
 	.probe = ehci_usb_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct fdt_usb),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct fdt_usb),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index dd82669b284..12bba263b95 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -353,8 +353,8 @@  U_BOOT_DRIVER(usb_ehci) = {
 	.remove = ehci_deregister,
 	.ops = &ehci_usb_ops,
 	.ofdata_to_platdata = vf_usb_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ehci_vf_priv_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct ehci_vf_priv_data),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 80f1d6fd97c..738eed3bfea 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -85,7 +85,7 @@  U_BOOT_DRIVER(ehci_zynq) = {
 	.probe = ehci_zynq_probe,
 	.remove = ehci_deregister,
 	.ops	= &ehci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct zynq_ehci_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct zynq_ehci_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index aa1eba262a9..33c4a911a09 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -174,7 +174,7 @@  U_BOOT_DRIVER(ohci_generic) = {
 	.probe = ohci_da8xx_probe,
 	.remove = ohci_da8xx_remove,
 	.ops	= &ohci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct da8xx_ohci),
+	.priv_auto	= sizeof(struct da8xx_ohci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_OS_PREPARE,
 };
 #endif
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
index ac9b7e1e3c0..163f0ef17b1 100644
--- a/drivers/usb/host/ohci-generic.c
+++ b/drivers/usb/host/ohci-generic.c
@@ -198,6 +198,6 @@  U_BOOT_DRIVER(ohci_generic) = {
 	.probe = ohci_usb_probe,
 	.remove = ohci_usb_remove,
 	.ops	= &ohci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct generic_ohci),
+	.priv_auto	= sizeof(struct generic_ohci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 4c1c7786728..48ffa4af5ed 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -39,8 +39,8 @@  U_BOOT_DRIVER(ohci_pci) = {
 	.remove = ohci_pci_remove,
 	.of_match = ohci_pci_ids,
 	.ops	= &ohci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(ohci_t),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(ohci_t),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 37aa2c55f24..7620ac2da79 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -894,6 +894,6 @@  U_BOOT_DRIVER(usb_r8a66597) = {
 	.probe	= r8a66597_usb_probe,
 	.remove = r8a66597_usb_remove,
 	.ops	= &r8a66597_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct r8a66597),
+	.priv_auto	= sizeof(struct r8a66597),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index cc357d9ef40..d7cc92aa544 100644
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -155,5 +155,5 @@  U_BOOT_DRIVER(usb_sandbox) = {
 	.of_match = sandbox_usb_ids,
 	.probe = sandbox_usb_probe,
 	.ops	= &sandbox_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_usb_ctrl),
+	.priv_auto	= sizeof(struct sandbox_usb_ctrl),
 };
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index de8a244625e..831f4935320 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -849,12 +849,12 @@  UCLASS_DRIVER(usb) = {
 	.name		= "usb",
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 	.post_bind	= dm_scan_fdt_dev,
-	.priv_auto_alloc_size = sizeof(struct usb_uclass_priv),
-	.per_child_auto_alloc_size = sizeof(struct usb_device),
-	.per_device_auto_alloc_size = sizeof(struct usb_bus_priv),
+	.priv_auto	= sizeof(struct usb_uclass_priv),
+	.per_child_auto	= sizeof(struct usb_device),
+	.per_device_auto	= sizeof(struct usb_bus_priv),
 	.child_post_bind = usb_child_post_bind,
 	.child_pre_probe = usb_child_pre_probe,
-	.per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
+	.per_child_platdata_auto	= sizeof(struct usb_dev_platdata),
 };
 
 UCLASS_DRIVER(usb_dev_generic) = {
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index ee65f51c5d2..f50f069fc74 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -92,7 +92,7 @@  U_BOOT_DRIVER(usb_xhci) = {
 	.remove				= xhci_brcm_deregister,
 	.ops				= &xhci_usb_ops,
 	.of_match			= xhci_brcm_ids,
-	.platdata_auto_alloc_size	= sizeof(struct brcm_xhci_platdata),
-	.priv_auto_alloc_size		= sizeof(struct xhci_ctrl),
+	.platdata_auto	= sizeof(struct brcm_xhci_platdata),
+	.priv_auto		= sizeof(struct xhci_ctrl),
 	.flags				= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 045de2ffdec..4dba5699377 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -186,8 +186,8 @@  U_BOOT_DRIVER(xhci_dwc3) = {
 	.probe = xhci_dwc3_probe,
 	.remove = xhci_dwc3_remove,
 	.ops = &xhci_usb_ops,
-	.priv_auto_alloc_size = sizeof(struct xhci_ctrl),
-	.platdata_auto_alloc_size = sizeof(struct xhci_dwc3_platdata),
+	.priv_auto	= sizeof(struct xhci_ctrl),
+	.platdata_auto	= sizeof(struct xhci_dwc3_platdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
 #endif
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 6fb7a7f6e09..6e1b5f005f0 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -255,7 +255,7 @@  U_BOOT_DRIVER(usb_xhci) = {
 	.probe = xhci_usb_probe,
 	.remove = xhci_usb_remove,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct exynos_xhci_platdata),
-	.priv_auto_alloc_size = sizeof(struct exynos_xhci),
+	.platdata_auto	= sizeof(struct exynos_xhci_platdata),
+	.priv_auto	= sizeof(struct exynos_xhci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 0a2da70e200..95714d83386 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -169,8 +169,8 @@  U_BOOT_DRIVER(xhci_fsl) = {
 	.probe = xhci_fsl_probe,
 	.remove = xhci_fsl_remove,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct xhci_fsl_priv),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct xhci_fsl_priv),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 #else
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index f62e232d218..d301acc9a89 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -300,6 +300,6 @@  U_BOOT_DRIVER(usb_xhci) = {
 	.remove = xhci_mtk_remove,
 	.ops = &xhci_usb_ops,
 	.bind = dm_scan_fdt_dev,
-	.priv_auto_alloc_size = sizeof(struct mtk_xhci),
+	.priv_auto	= sizeof(struct mtk_xhci),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index f2e338f6fbc..6f56cc8384b 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -96,7 +96,7 @@  U_BOOT_DRIVER(usb_xhci) = {
 	.probe = xhci_usb_probe,
 	.remove = xhci_deregister,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct mvebu_xhci_platdata),
-	.priv_auto_alloc_size = sizeof(struct mvebu_xhci),
+	.platdata_auto	= sizeof(struct mvebu_xhci_platdata),
+	.priv_auto	= sizeof(struct mvebu_xhci),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 9fb6d2f7635..888b17ba4ce 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -59,8 +59,8 @@  U_BOOT_DRIVER(xhci_pci) = {
 	.remove = xhci_deregister,
 	.of_match = xhci_pci_ids,
 	.ops	= &xhci_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct xhci_ctrl),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct xhci_ctrl),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
 
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 5379dba5663..4322fb2e4d4 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -161,7 +161,7 @@  U_BOOT_DRIVER(usb_xhci) = {
 	.ops		= &xhci_usb_ops,
 	.of_match	= xhci_rcar_ids,
 	.ofdata_to_platdata = xhci_rcar_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct rcar_xhci_platdata),
-	.priv_auto_alloc_size = sizeof(struct rcar_xhci),
+	.platdata_auto	= sizeof(struct rcar_xhci_platdata),
+	.priv_auto	= sizeof(struct rcar_xhci),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 3795e695e87..c951107b201 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -257,7 +257,7 @@  U_BOOT_DRIVER(mtu3_peripheral) = {
 	.of_match = ssusb_of_match,
 	.probe = mtu3_gadget_probe,
 	.remove = mtu3_gadget_remove,
-	.priv_auto_alloc_size = sizeof(struct mtu3),
+	.priv_auto	= sizeof(struct mtu3),
 };
 #endif
 
@@ -298,7 +298,7 @@  U_BOOT_DRIVER(mtu3_host) = {
 	.of_match = ssusb_of_match,
 	.probe = mtu3_host_probe,
 	.remove = mtu3_host_remove,
-	.priv_auto_alloc_size = sizeof(struct mtu3_host),
+	.priv_auto	= sizeof(struct mtu3_host),
 	.ops = &xhci_usb_ops,
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
@@ -365,5 +365,5 @@  U_BOOT_DRIVER(mtu3) = {
 	.bind = mtu3_glue_bind,
 	.probe = mtu3_probe,
 	.remove = mtu3_remove,
-	.priv_auto_alloc_size = sizeof(struct ssusb_mtk),
+	.priv_auto	= sizeof(struct ssusb_mtk),
 };
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 67488ddb504..6c0d0b8b165 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -348,6 +348,6 @@  U_BOOT_DRIVER(da8xx_musb) = {
 	.probe = da8xx_musb_probe,
 	.remove = da8xx_musb_remove,
 	.ops = &musb_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct da8xx_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+	.platdata_auto	= sizeof(struct da8xx_musb_platdata),
+	.priv_auto	= sizeof(struct musb_host_data),
 };
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 8f0561eeba3..8adfa426c49 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -414,6 +414,6 @@  U_BOOT_DRIVER(mtk_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops		= &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct mtk_musb_glue),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct mtk_musb_glue),
 };
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index da63cc2c224..2e029d84bc8 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -280,8 +280,8 @@  U_BOOT_DRIVER(omap2430_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops = &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct omap2430_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+	.platdata_auto	= sizeof(struct omap2430_musb_platdata),
+	.priv_auto	= sizeof(struct musb_host_data),
 };
 
 #endif /* CONFIG_IS_ENABLED(DM_USB) */
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 2fbe9bebf17..e45ab20562c 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -288,6 +288,6 @@  U_BOOT_DRIVER(usb_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops		= &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct pic32_musb_data),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct pic32_musb_data),
 };
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 187db7794b6..10bc3e89560 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -552,6 +552,6 @@  U_BOOT_DRIVER(usb_musb) = {
 #ifdef CONFIG_USB_MUSB_HOST
 	.ops		= &musb_usb_ops,
 #endif
-	.platdata_auto_alloc_size = sizeof(struct usb_platdata),
-	.priv_auto_alloc_size = sizeof(struct sunxi_glue),
+	.platdata_auto	= sizeof(struct usb_platdata),
+	.priv_auto	= sizeof(struct sunxi_glue),
 };
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index f4f26d86b3f..34b1a34d2cc 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -204,8 +204,8 @@  U_BOOT_DRIVER(ti_musb_host) = {
 	.probe = ti_musb_host_probe,
 	.remove = ti_musb_host_remove,
 	.ops	= &musb_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct ti_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct musb_host_data),
+	.platdata_auto	= sizeof(struct ti_musb_platdata),
+	.priv_auto	= sizeof(struct musb_host_data),
 };
 
 #if CONFIG_IS_ENABLED(DM_USB_GADGET)
@@ -277,8 +277,8 @@  U_BOOT_DRIVER(ti_musb_peripheral) = {
 	.probe = ti_musb_peripheral_probe,
 	.remove = ti_musb_peripheral_remove,
 	.ops	= &musb_usb_ops,
-	.platdata_auto_alloc_size = sizeof(struct ti_musb_platdata),
-	.priv_auto_alloc_size = sizeof(struct ti_musb_peripheral),
+	.platdata_auto	= sizeof(struct ti_musb_platdata),
+	.priv_auto	= sizeof(struct ti_musb_peripheral),
 	.flags = DM_FLAG_PRE_RELOC,
 };
 #endif
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2707ff59c7d..6620c793a1c 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -614,7 +614,7 @@  U_BOOT_DRIVER(am335x_fb) = {
 	.ofdata_to_platdata = am335x_fb_ofdata_to_platdata,
 	.probe = am335x_fb_probe,
 	.remove = am335x_fb_remove,
-	.priv_auto_alloc_size = sizeof(struct am335x_fb_priv),
+	.priv_auto	= sizeof(struct am335x_fb_priv),
 };
 
 #endif /* CONFIG_DM_VIDEO */
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 38def2816b2..3eb80c13946 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -562,7 +562,7 @@  U_BOOT_DRIVER(atmel_hlcdfb) = {
 	.bind	= atmel_hlcdc_bind,
 	.probe	= atmel_hlcdc_probe,
 	.ofdata_to_platdata = atmel_hlcdc_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct atmel_hlcdc_priv),
+	.priv_auto	= sizeof(struct atmel_hlcdc_priv),
 };
 
 #endif
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index ae8ec26468f..b129309d34b 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -306,7 +306,7 @@  U_BOOT_DRIVER(atmel_fb) = {
 	.bind	= atmel_fb_lcd_bind,
 	.ofdata_to_platdata	= atmel_fb_ofdata_to_platdata,
 	.probe	= atmel_fb_lcd_probe,
-	.platdata_auto_alloc_size = sizeof(struct atmel_lcd_platdata),
-	.priv_auto_alloc_size	= sizeof(struct atmel_fb_priv),
+	.platdata_auto	= sizeof(struct atmel_lcd_platdata),
+	.priv_auto	= sizeof(struct atmel_fb_priv),
 };
 #endif
diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c
index 67fed7f224a..8e34022d836 100644
--- a/drivers/video/backlight_gpio.c
+++ b/drivers/video/backlight_gpio.c
@@ -68,5 +68,5 @@  U_BOOT_DRIVER(gpio_backlight) = {
 	.ops	= &gpio_backlight_ops,
 	.ofdata_to_platdata	= gpio_backlight_ofdata_to_platdata,
 	.probe		= gpio_backlight_probe,
-	.priv_auto_alloc_size	= sizeof(struct gpio_backlight_priv),
+	.priv_auto	= sizeof(struct gpio_backlight_priv),
 };
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index 1c5270ff05c..147cdcc6d58 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -421,5 +421,5 @@  U_BOOT_DRIVER(analogix_anx6345) = {
 	.of_match = anx6345_ids,
 	.probe	= anx6345_probe,
 	.ops	= &anx6345_ops,
-	.priv_auto_alloc_size = sizeof(struct anx6345_priv),
+	.priv_auto	= sizeof(struct anx6345_priv),
 };
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 389b02cdcba..08d38b244bd 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -134,6 +134,6 @@  int video_bridge_set_active(struct udevice *dev, bool active)
 UCLASS_DRIVER(video_bridge) = {
 	.id		= UCLASS_VIDEO_BRIDGE,
 	.name		= "video_bridge",
-	.per_device_auto_alloc_size	= sizeof(struct video_bridge_priv),
+	.per_device_auto	= sizeof(struct video_bridge_priv),
 	.pre_probe	= video_bridge_pre_probe,
 };
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index df6a761d2db..bc91e7bda58 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -781,6 +781,6 @@  U_BOOT_DRIVER(broadwell_igd) = {
 	.ofdata_to_platdata = broadwell_igd_ofdata_to_platdata,
 	.bind	= broadwell_igd_bind,
 	.probe	= broadwell_igd_probe,
-	.priv_auto_alloc_size	= sizeof(struct broadwell_igd_priv),
-	.platdata_auto_alloc_size	= sizeof(struct broadwell_igd_plat),
+	.priv_auto	= sizeof(struct broadwell_igd_priv),
+	.platdata_auto	= sizeof(struct broadwell_igd_plat),
 };
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 8205413d2ab..fa11b3bbefe 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -588,5 +588,5 @@  U_BOOT_DRIVER(vidconsole_truetype) = {
 	.id	= UCLASS_VIDEO_CONSOLE,
 	.ops	= &console_truetype_ops,
 	.probe	= console_truetype_probe,
-	.priv_auto_alloc_size	= sizeof(struct console_tt_priv),
+	.priv_auto	= sizeof(struct console_tt_priv),
 };
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 1a29ce5d858..5d6f0c17310 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -79,5 +79,5 @@  bool display_in_use(struct udevice *dev)
 UCLASS_DRIVER(display) = {
 	.id		= UCLASS_DISPLAY,
 	.name		= "display",
-	.per_device_platdata_auto_alloc_size	= sizeof(struct display_plat),
+	.per_device_platdata_auto	= sizeof(struct display_plat),
 };
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 4055ef49b6e..4dde6488144 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -845,7 +845,7 @@  U_BOOT_DRIVER(dw_mipi_dsi) = {
 	.id			= UCLASS_DSI_HOST,
 	.probe			= dw_mipi_dsi_probe,
 	.ops			= &dw_mipi_dsi_ops,
-	.priv_auto_alloc_size	= sizeof(struct dw_mipi_dsi),
+	.priv_auto	= sizeof(struct dw_mipi_dsi),
 };
 
 MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 999ee1c14af..f18189a1de0 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -1081,5 +1081,5 @@  U_BOOT_DRIVER(exynos_dp) = {
 	.of_match = exynos_dp_ids,
 	.ops	= &exynos_dp_ops,
 	.ofdata_to_platdata	= exynos_dp_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct exynos_dp_priv),
+	.priv_auto	= sizeof(struct exynos_dp_priv),
 };
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 979b9091827..7022eec4b7a 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -716,5 +716,5 @@  U_BOOT_DRIVER(exynos_fb) = {
 	.bind	= exynos_fb_bind,
 	.probe	= exynos_fb_probe,
 	.ofdata_to_platdata	= exynos_fb_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct exynos_fb_priv),
+	.priv_auto	= sizeof(struct exynos_fb_priv),
 };
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index f02fd13d28c..73b8f4bd1c9 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -338,5 +338,5 @@  U_BOOT_DRIVER(ihs_video_out_drv) = {
 	.ops		= &ihs_video_out_ops,
 	.of_match       = ihs_video_out_ids,
 	.probe          = ihs_video_out_probe,
-	.priv_auto_alloc_size = sizeof(struct ihs_video_out_priv),
+	.priv_auto	= sizeof(struct ihs_video_out_priv),
 };
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index eb93a4f1fa9..dc8f2cfd800 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -671,6 +671,6 @@  U_BOOT_DRIVER(fsl_imx6q_ipu) = {
 	.of_match = ipuv3_video_ids,
 	.bind	= ipuv3_video_bind,
 	.probe	= ipuv3_video_probe,
-	.priv_auto_alloc_size = sizeof(struct ipuv3_video_priv),
+	.priv_auto	= sizeof(struct ipuv3_video_priv),
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 45df9c13474..73a1add0853 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -327,5 +327,5 @@  U_BOOT_DRIVER(lg4573_lcd) = {
 	.of_match = lg4573_ids,
 	.bind   = lg4573_bind,
 	.probe  = lg4573_probe,
-	.priv_auto_alloc_size = sizeof(struct lg4573_lcd_priv),
+	.priv_auto	= sizeof(struct lg4573_lcd_priv),
 };
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 9bc4bbb85d3..624084d38bc 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -2292,6 +2292,6 @@  U_BOOT_DRIVER(logicore_dp_tx) = {
 	.id			= UCLASS_DISPLAY,
 	.of_match		= logicore_dp_tx_ids,
 	.probe			= logicore_dp_tx_probe,
-	.priv_auto_alloc_size	= sizeof(struct dp_tx),
+	.priv_auto	= sizeof(struct dp_tx),
 	.ops			= &logicore_dp_tx_ops,
 };
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 1e6da0e1e25..0ffdd7b98f3 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -403,6 +403,6 @@  U_BOOT_DRIVER(mali_dp) = {
 	.of_match	= malidp_ids,
 	.bind		= malidp_bind,
 	.probe		= malidp_probe,
-	.priv_auto_alloc_size	= sizeof(struct malidp_priv),
+	.priv_auto	= sizeof(struct malidp_priv),
 	.ops		= &malidp_ops,
 };
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 5d74f7f1a74..e5f28132053 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -508,5 +508,5 @@  U_BOOT_DRIVER(meson_dw_hdmi) = {
 	.of_match = meson_dw_hdmi_ids,
 	.ops = &meson_dw_hdmi_ops,
 	.probe = meson_dw_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct meson_dw_hdmi),
+	.priv_auto	= sizeof(struct meson_dw_hdmi),
 };
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 4868839ff7d..23b5ec6ef17 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -211,6 +211,6 @@  U_BOOT_DRIVER(meson_vpu) = {
 	.of_match = meson_vpu_ids,
 	.probe = meson_vpu_probe,
 	.bind = meson_vpu_bind,
-	.priv_auto_alloc_size = sizeof(struct meson_vpu_priv),
+	.priv_auto	= sizeof(struct meson_vpu_priv),
 	.flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
 };
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index f3cb2bfb480..af97c711564 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -594,5 +594,5 @@  U_BOOT_DRIVER(mvebu_video) = {
 	.of_match = mvebu_video_ids,
 	.bind	= mvebu_video_bind,
 	.probe	= mvebu_video_probe,
-	.priv_auto_alloc_size = sizeof(struct mvebu_video_priv),
+	.priv_auto	= sizeof(struct mvebu_video_priv),
 };
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 4101e0962a9..d0b89433128 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -643,9 +643,9 @@  U_BOOT_DRIVER(nexell_display) = {
 	.name = "nexell-display",
 	.id = UCLASS_VIDEO,
 	.of_match = nx_display_ids,
-	.platdata_auto_alloc_size =
+	.platdata_auto	=
 	    sizeof(struct nx_display_platdata),
 	.bind = nx_display_bind,
 	.probe = nx_display_probe,
-	.priv_auto_alloc_size = sizeof(struct nx_display_dev),
+	.priv_auto	= sizeof(struct nx_display_dev),
 };
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 362bf6a6fe4..bb8c33bfc7a 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -366,6 +366,6 @@  U_BOOT_DRIVER(otm8009a_panel) = {
 	.ops			  = &otm8009a_panel_ops,
 	.ofdata_to_platdata	  = otm8009a_panel_ofdata_to_platdata,
 	.probe			  = otm8009a_panel_probe,
-	.platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
-	.priv_auto_alloc_size	= sizeof(struct otm8009a_panel_priv),
+	.platdata_auto	= sizeof(struct mipi_dsi_panel_plat),
+	.priv_auto	= sizeof(struct otm8009a_panel_priv),
 };
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 9519180ceb3..49a3c7a58e8 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -265,5 +265,5 @@  U_BOOT_DRIVER(pwm_backlight) = {
 	.ops	= &pwm_backlight_ops,
 	.ofdata_to_platdata	= pwm_backlight_ofdata_to_platdata,
 	.probe		= pwm_backlight_probe,
-	.priv_auto_alloc_size	= sizeof(struct pwm_backlight_priv),
+	.priv_auto	= sizeof(struct pwm_backlight_priv),
 };
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 353894503b9..9d103f1f17b 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -338,6 +338,6 @@  U_BOOT_DRIVER(rm68200_panel) = {
 	.ops			  = &rm68200_panel_ops,
 	.ofdata_to_platdata	  = rm68200_panel_ofdata_to_platdata,
 	.probe			  = rm68200_panel_probe,
-	.platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
-	.priv_auto_alloc_size	= sizeof(struct rm68200_panel_priv),
+	.platdata_auto	= sizeof(struct mipi_dsi_panel_plat),
+	.priv_auto	= sizeof(struct rm68200_panel_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c
index f835f4d517a..41f05b7ec6d 100644
--- a/drivers/video/rockchip/rk3288_hdmi.c
+++ b/drivers/video/rockchip/rk3288_hdmi.c
@@ -113,5 +113,5 @@  U_BOOT_DRIVER(rk3288_hdmi_rockchip) = {
 	.ops = &rk3288_hdmi_ops,
 	.ofdata_to_platdata = rk3288_hdmi_ofdata_to_platdata,
 	.probe = rk3288_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct rk_hdmi_priv),
+	.priv_auto	= sizeof(struct rk_hdmi_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index 8ac0125b502..ff6f132bab2 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -185,5 +185,5 @@  U_BOOT_DRIVER(rk_mipi_dsi) = {
 	.ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
 	.probe	= rk_mipi_probe,
 	.ops	= &rk_mipi_dsi_ops,
-	.priv_auto_alloc_size   = sizeof(struct rk_mipi_priv),
+	.priv_auto	  = sizeof(struct rk_mipi_priv),
 };
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index 9ec33e6e511..3f6ee744871 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -105,5 +105,5 @@  U_BOOT_DRIVER(rockchip_rk3288_vop) = {
 	.bind	= rk_vop_bind,
 	.probe	= rk3288_vop_probe,
         .remove = rk_vop_remove,
-	.priv_auto_alloc_size	= sizeof(struct rk_vop_priv),
+	.priv_auto	= sizeof(struct rk_vop_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c
index a62be983275..d9f15adc5cf 100644
--- a/drivers/video/rockchip/rk3399_hdmi.c
+++ b/drivers/video/rockchip/rk3399_hdmi.c
@@ -76,5 +76,5 @@  U_BOOT_DRIVER(rk3399_hdmi_rockchip) = {
 	.ops = &rk3399_hdmi_ops,
 	.ofdata_to_platdata = rk3399_hdmi_ofdata_to_platdata,
 	.probe = rk3399_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct rk_hdmi_priv),
+	.priv_auto	= sizeof(struct rk_hdmi_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index e5534c36e6e..873f7fdae00 100644
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/drivers/video/rockchip/rk3399_mipi.c
@@ -176,5 +176,5 @@  U_BOOT_DRIVER(rk_mipi_dsi) = {
 	.ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
 	.probe	= rk_mipi_probe,
 	.ops	= &rk_mipi_dsi_ops,
-	.priv_auto_alloc_size   = sizeof(struct rk_mipi_priv),
+	.priv_auto	  = sizeof(struct rk_mipi_priv),
 };
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index 55d1be0411d..30e81b88b69 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -99,5 +99,5 @@  U_BOOT_DRIVER(rk3399_vop) = {
 	.ops	= &rk3399_vop_ops,
 	.bind	= rk_vop_bind,
 	.probe	= rk3399_vop_probe,
-	.priv_auto_alloc_size	= sizeof(struct rk_vop_priv),
+	.priv_auto	= sizeof(struct rk_vop_priv),
 };
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index c55f7a4f72a..282fe09fdfb 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -1102,5 +1102,5 @@  U_BOOT_DRIVER(dp_rockchip) = {
 	.ofdata_to_platdata	= rk_edp_ofdata_to_platdata,
 	.probe	= rk_edp_probe,
 	.remove	= rk_edp_remove,
-	.priv_auto_alloc_size	= sizeof(struct rk_edp_priv),
+	.priv_auto	= sizeof(struct rk_edp_priv),
 };
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 04f795a213c..c93b5dfeed3 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -247,5 +247,5 @@  U_BOOT_DRIVER(lvds_rockchip) = {
 	.ops	= &lvds_rockchip_ops,
 	.ofdata_to_platdata	= rk_lvds_ofdata_to_platdata,
 	.probe	= rk_lvds_probe,
-	.priv_auto_alloc_size	= sizeof(struct rk_lvds_priv),
+	.priv_auto	= sizeof(struct rk_lvds_priv),
 };
diff --git a/drivers/video/sandbox_dsi_host.c b/drivers/video/sandbox_dsi_host.c
index cd644ec0b46..c84a27ee3be 100644
--- a/drivers/video/sandbox_dsi_host.c
+++ b/drivers/video/sandbox_dsi_host.c
@@ -86,5 +86,5 @@  U_BOOT_DRIVER(sandbox_dsi_host) = {
 	.id		      = UCLASS_DSI_HOST,
 	.of_match	      = sandbox_dsi_host_ids,
 	.ops		      = &sandbox_dsi_host_ops,
-	.priv_auto_alloc_size = sizeof(struct sandbox_dsi_host_priv),
+	.priv_auto	= sizeof(struct sandbox_dsi_host_priv),
 };
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index 7e722326b3d..2a854d3958b 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -158,5 +158,5 @@  U_BOOT_DRIVER(sandbox_osd_drv) = {
 	.ops		= &sandbox_osd_ops,
 	.of_match       = sandbox_osd_ids,
 	.probe          = sandbox_osd_probe,
-	.priv_auto_alloc_size = sizeof(struct sandbox_osd_priv),
+	.priv_auto	= sizeof(struct sandbox_osd_priv),
 };
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index d806f35debb..c989510640d 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -78,5 +78,5 @@  U_BOOT_DRIVER(sandbox_lcd_sdl) = {
 	.of_match = sandbox_sdl_ids,
 	.bind	= sandbox_sdl_bind,
 	.probe	= sandbox_sdl_probe,
-	.platdata_auto_alloc_size	= sizeof(struct sandbox_sdl_plat),
+	.platdata_auto	= sizeof(struct sandbox_sdl_plat),
 };
diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
index 6c624c37699..3be4f25d8b3 100644
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@ -118,5 +118,5 @@  U_BOOT_DRIVER(simple_panel) = {
 	.ops	= &simple_panel_ops,
 	.ofdata_to_platdata	= simple_panel_ofdata_to_platdata,
 	.probe		= simple_panel_probe,
-	.priv_auto_alloc_size	= sizeof(struct simple_panel_priv),
+	.priv_auto	= sizeof(struct simple_panel_priv),
 };
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index 9d5abacc2bf..9941382a7d6 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -512,5 +512,5 @@  U_BOOT_DRIVER(stm32_dsi) = {
 	.bind				= stm32_dsi_bind,
 	.probe				= stm32_dsi_probe,
 	.ops				= &stm32_dsi_ops,
-	.priv_auto_alloc_size		= sizeof(struct stm32_dsi_priv),
+	.priv_auto		= sizeof(struct stm32_dsi_priv),
 };
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 7fff735930b..07a9acbb8ee 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -473,5 +473,5 @@  U_BOOT_DRIVER(stm32_ltdc) = {
 	.of_match		= stm32_ltdc_ids,
 	.probe			= stm32_ltdc_probe,
 	.bind			= stm32_ltdc_bind,
-	.priv_auto_alloc_size	= sizeof(struct stm32_ltdc_priv),
+	.priv_auto	= sizeof(struct stm32_ltdc_priv),
 };
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index 01d4b7a11c9..6b6792a3dd9 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -395,7 +395,7 @@  U_BOOT_DRIVER(sunxi_dw_hdmi) = {
 	.id	= UCLASS_DISPLAY,
 	.ops	= &sunxi_dw_hdmi_ops,
 	.probe	= sunxi_dw_hdmi_probe,
-	.priv_auto_alloc_size = sizeof(struct sunxi_dw_hdmi_priv),
+	.priv_auto	= sizeof(struct sunxi_dw_hdmi_priv),
 };
 
 U_BOOT_DEVICE(sunxi_dw_hdmi) = {
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 49bf083a8d1..dd2bb1f5fc5 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -142,7 +142,7 @@  U_BOOT_DRIVER(sunxi_lcd) = {
 	.id     = UCLASS_DISPLAY,
 	.ops    = &sunxi_lcd_ops,
 	.probe  = sunxi_lcd_probe,
-	.priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv),
+	.priv_auto	= sizeof(struct sunxi_lcd_priv),
 };
 
 #ifdef CONFIG_MACH_SUN50I
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index 191cda3ce76..24487439045 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -651,5 +651,5 @@  U_BOOT_DRIVER(tda19988) = {
 	.of_match = tda19988_ids,
 	.ops = &tda19988_ops,
 	.probe = tda19988_probe,
-	.priv_auto_alloc_size = sizeof(struct tda19988_priv),
+	.priv_auto	= sizeof(struct tda19988_priv),
 };
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 827ea13d13a..25199333741 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -424,5 +424,5 @@  U_BOOT_DRIVER(tegra_lcd) = {
 	.bind	= tegra_lcd_bind,
 	.probe	= tegra_lcd_probe,
 	.ofdata_to_platdata	= tegra_lcd_ofdata_to_platdata,
-	.priv_auto_alloc_size	= sizeof(struct tegra_lcd_priv),
+	.priv_auto	= sizeof(struct tegra_lcd_priv),
 };
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 59758eb9361..881923f2292 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -1619,6 +1619,6 @@  U_BOOT_DRIVER(dp_tegra) = {
 	.ofdata_to_platdata = tegra_dp_ofdata_to_platdata,
 	.probe	= dp_tegra_probe,
 	.ops	= &dp_tegra_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra_dp_priv),
-	.platdata_auto_alloc_size = sizeof(struct tegra_dp_plat),
+	.priv_auto	= sizeof(struct tegra_dp_priv),
+	.platdata_auto	= sizeof(struct tegra_dp_plat),
 };
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 49f33c15b5c..83f3aad92cb 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -1079,5 +1079,5 @@  U_BOOT_DRIVER(sor_tegra) = {
 	.of_match = tegra_sor_ids,
 	.ofdata_to_platdata = tegra_sor_ofdata_to_platdata,
 	.ops	= &tegra_sor_ops,
-	.priv_auto_alloc_size = sizeof(struct tegra_dc_sor_data),
+	.priv_auto	= sizeof(struct tegra_dc_sor_data),
 };
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 9fa124b3c03..ceb4744354a 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -626,7 +626,7 @@  UCLASS_DRIVER(vidconsole) = {
 	.name		= "vidconsole0",
 	.pre_probe	= vidconsole_pre_probe,
 	.post_probe	= vidconsole_post_probe,
-	.per_device_auto_alloc_size	= sizeof(struct vidconsole_priv),
+	.per_device_auto	= sizeof(struct vidconsole_priv),
 };
 
 #ifdef CONFIG_VIDEO_COPY
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 650891e49dd..925731341cf 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -408,7 +408,7 @@  UCLASS_DRIVER(video) = {
 	.pre_probe	= video_pre_probe,
 	.post_probe	= video_post_probe,
 	.pre_remove	= video_pre_remove,
-	.priv_auto_alloc_size	= sizeof(struct video_uc_priv),
-	.per_device_auto_alloc_size	= sizeof(struct video_priv),
-	.per_device_platdata_auto_alloc_size = sizeof(struct video_uc_platdata),
+	.priv_auto	= sizeof(struct video_uc_priv),
+	.per_device_auto	= sizeof(struct video_priv),
+	.per_device_platdata_auto	= sizeof(struct video_uc_platdata),
 };
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 53c17429725..cf2cfaef2cf 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -369,5 +369,5 @@  UCLASS_DRIVER(virtio) = {
 	.child_post_bind = virtio_uclass_child_post_bind,
 	.child_pre_probe = virtio_uclass_child_pre_probe,
 	.child_post_probe = virtio_uclass_child_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct virtio_dev_priv),
+	.per_device_auto	= sizeof(struct virtio_dev_priv),
 };
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 1799f5c5eb3..a007a6a33a8 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -134,6 +134,6 @@  U_BOOT_DRIVER(virtio_blk) = {
 	.bind	= virtio_blk_bind,
 	.probe	= virtio_blk_probe,
 	.remove	= virtio_reset,
-	.priv_auto_alloc_size = sizeof(struct virtio_blk_priv),
+	.priv_auto	= sizeof(struct virtio_blk_priv),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index b951ea3257b..90ee1d4271e 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -412,5 +412,5 @@  U_BOOT_DRIVER(virtio_mmio) = {
 	.ops	= &virtio_mmio_ops,
 	.probe	= virtio_mmio_probe,
 	.ofdata_to_platdata = virtio_mmio_ofdata_to_platdata,
-	.priv_auto_alloc_size = sizeof(struct virtio_mmio_priv),
+	.priv_auto	= sizeof(struct virtio_mmio_priv),
 };
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index 0dbbd780230..e1831cf9618 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -233,7 +233,7 @@  U_BOOT_DRIVER(virtio_net) = {
 	.probe	= virtio_net_probe,
 	.remove = virtio_reset,
 	.ops	= &virtio_net_ops,
-	.priv_auto_alloc_size = sizeof(struct virtio_net_priv),
-	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.priv_auto	= sizeof(struct virtio_net_priv),
+	.platdata_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index fa7f2429f1f..0a2431a97fc 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -350,7 +350,7 @@  U_BOOT_DRIVER(virtio_pci_legacy) = {
 	.ops	= &virtio_pci_ops,
 	.bind	= virtio_pci_bind,
 	.probe	= virtio_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct virtio_pci_priv),
+	.priv_auto	= sizeof(struct virtio_pci_priv),
 };
 
 static struct pci_device_id virtio_pci_supported[] = {
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 2e5bbade002..8996ac0d6e3 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -539,7 +539,7 @@  U_BOOT_DRIVER(virtio_pci_modern) = {
 	.ops	= &virtio_pci_ops,
 	.bind	= virtio_pci_bind,
 	.probe	= virtio_pci_probe,
-	.priv_auto_alloc_size = sizeof(struct virtio_pci_priv),
+	.priv_auto	= sizeof(struct virtio_pci_priv),
 };
 
 static struct pci_device_id virtio_pci_supported[] = {
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index fc3e19cfaee..9314c0a03ed 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -84,6 +84,6 @@  U_BOOT_DRIVER(virtio_rng) = {
 	.probe	= virtio_rng_probe,
 	.remove = virtio_reset,
 	.ops	= &virtio_rng_ops,
-	.priv_auto_alloc_size = sizeof(struct virtio_rng_priv),
+	.priv_auto	= sizeof(struct virtio_rng_priv),
 	.flags	= DM_FLAG_ACTIVE_DMA,
 };
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 2a2abb9d499..aafb7beb949 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -204,7 +204,7 @@  U_BOOT_DRIVER(virtio_sandbox1) = {
 	.ops	= &virtio_sandbox1_ops,
 	.probe	= virtio_sandbox_probe,
 	.child_post_remove = virtio_sandbox_child_post_remove,
-	.priv_auto_alloc_size = sizeof(struct virtio_sandbox_priv),
+	.priv_auto	= sizeof(struct virtio_sandbox_priv),
 };
 
 /* this one without notify op */
@@ -231,5 +231,5 @@  U_BOOT_DRIVER(virtio_sandbox2) = {
 	.of_match = virtio_sandbox2_ids,
 	.ops	= &virtio_sandbox2_ops,
 	.probe	= virtio_sandbox_probe,
-	.priv_auto_alloc_size = sizeof(struct virtio_sandbox_priv),
+	.priv_auto	= sizeof(struct virtio_sandbox_priv),
 };
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 8e6372f0bed..aced1b0e2ed 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -230,6 +230,6 @@  U_BOOT_DRIVER(mxc_w1_drv) = {
 	.of_match			= mxc_w1_id,
 	.ofdata_to_platdata		= mxc_w1_ofdata_to_platdata,
 	.ops				= &mxc_w1_ops,
-	.platdata_auto_alloc_size	= sizeof(struct mxc_w1_pdata),
+	.platdata_auto	= sizeof(struct mxc_w1_pdata),
 	.probe				= mxc_w1_probe,
 };
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index 45ad47a5d6b..6e48e53ddc3 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -174,5 +174,5 @@  U_BOOT_DRIVER(w1_gpio_drv) = {
 	.of_match			= w1_gpio_id,
 	.ofdata_to_platdata		= w1_gpio_ofdata_to_platdata,
 	.ops				= &w1_gpio_ops,
-	.platdata_auto_alloc_size	= sizeof(struct w1_gpio_pdata),
+	.platdata_auto	= sizeof(struct w1_gpio_pdata),
 };
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 9478c93e9b0..af1fe5fd22f 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -230,10 +230,10 @@  UCLASS_DRIVER(w1) = {
 	.name		= "w1",
 	.id		= UCLASS_W1,
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
-	.per_device_auto_alloc_size	= sizeof(struct w1_bus),
+	.per_device_auto	= sizeof(struct w1_bus),
 	.post_probe	= w1_post_probe,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	.post_bind	= dm_scan_fdt_dev,
 #endif
-	.per_child_platdata_auto_alloc_size     = sizeof(struct w1_device),
+	.per_child_platdata_auto	    = sizeof(struct w1_device),
 };
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 5da8e56505f..dd97a17a701 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -196,6 +196,6 @@  U_BOOT_DRIVER(a37xx_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = a37xx_wdt_ids,
 	.probe = a37xx_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct a37xx_wdt),
+	.priv_auto	= sizeof(struct a37xx_wdt),
 	.ops = &a37xx_wdt_ops,
 };
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index c9c4a1fdc5f..9e2f484f4a2 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -124,7 +124,7 @@  U_BOOT_DRIVER(ast_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = ast_wdt_ids,
 	.probe = ast_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct ast_wdt_priv),
+	.priv_auto	= sizeof(struct ast_wdt_priv),
 	.ofdata_to_platdata = ast_wdt_ofdata_to_platdata,
 	.ops = &ast_wdt_ops,
 };
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 3455a80228d..9e0d89be62d 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -117,7 +117,7 @@  U_BOOT_DRIVER(atmel_at91sam9260_wdt) = {
 	.name = "atmel_at91sam9260_wdt",
 	.id = UCLASS_WDT,
 	.of_match = at91_wdt_ids,
-	.priv_auto_alloc_size = sizeof(struct at91_wdt_priv),
+	.priv_auto	= sizeof(struct at91_wdt_priv),
 	.ops = &at91_wdt_ops,
 	.probe = at91_wdt_probe,
 };
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index ee77f49a944..677b1347ca7 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -112,6 +112,6 @@  U_BOOT_DRIVER(wdt_bcm6345) = {
 	.id = UCLASS_WDT,
 	.of_match = bcm6345_wdt_ids,
 	.ops = &bcm6345_wdt_ops,
-	.priv_auto_alloc_size = sizeof(struct bcm6345_wdt_priv),
+	.priv_auto	= sizeof(struct bcm6345_wdt_priv),
 	.probe = bcm6345_wdt_probe,
 };
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index 1e703f07f70..44a9769c5df 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -260,7 +260,7 @@  U_BOOT_DRIVER(cdns_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = cdns_wdt_ids,
 	.probe = cdns_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct cdns_wdt_priv),
+	.priv_auto	= sizeof(struct cdns_wdt_priv),
 	.ofdata_to_platdata = cdns_wdt_ofdata_to_platdata,
 	.ops = &cdns_wdt_ops,
 };
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index 7caa6c550cd..c020324973e 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -168,7 +168,7 @@  U_BOOT_DRIVER(designware_wdt) = {
 	.name = "designware_wdt",
 	.id = UCLASS_WDT,
 	.of_match = designware_wdt_ids,
-	.priv_auto_alloc_size = sizeof(struct designware_wdt_priv),
+	.priv_auto	= sizeof(struct designware_wdt_priv),
 	.probe = designware_wdt_probe,
 	.ops = &designware_wdt_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index b90c2daecee..5e0a096ce50 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -169,7 +169,7 @@  U_BOOT_DRIVER(imx_wdt) = {
 	.of_match	= imx_wdt_ids,
 	.probe		= imx_wdt_probe,
 	.ops		= &imx_wdt_ops,
-	.priv_auto_alloc_size = sizeof(struct imx_wdt_priv),
+	.priv_auto	= sizeof(struct imx_wdt_priv),
 	.flags		= DM_FLAG_PRE_RELOC,
 };
 #endif
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index 1cd8866ef8d..8b5ed28ebd3 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -98,6 +98,6 @@  U_BOOT_DRIVER(mt762x_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = mt762x_wdt_ids,
 	.probe = mt762x_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct mt762x_wdt),
+	.priv_auto	= sizeof(struct mt762x_wdt),
 	.ops = &mt762x_wdt_ops,
 };
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index a636cff354d..b098b2e3cfa 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -152,7 +152,7 @@  U_BOOT_DRIVER(mtk_wdt) = {
 	.name = "mtk_wdt",
 	.id = UCLASS_WDT,
 	.of_match = mtk_wdt_ids,
-	.priv_auto_alloc_size = sizeof(struct mtk_wdt_priv),
+	.priv_auto	= sizeof(struct mtk_wdt_priv),
 	.probe = mtk_wdt_probe,
 	.ops = &mtk_wdt_ops,
 	.flags = DM_FLAG_PRE_RELOC,
diff --git a/drivers/watchdog/octeontx_wdt.c b/drivers/watchdog/octeontx_wdt.c
index 88708dc5e1c..5f586ef6837 100644
--- a/drivers/watchdog/octeontx_wdt.c
+++ b/drivers/watchdog/octeontx_wdt.c
@@ -137,7 +137,7 @@  U_BOOT_DRIVER(wdt_octeontx) = {
 	.id = UCLASS_WDT,
 	.of_match = octeontx_wdt_ids,
 	.ops = &octeontx_wdt_ops,
-	.priv_auto_alloc_size = sizeof(struct octeontx_wdt),
+	.priv_auto	= sizeof(struct octeontx_wdt),
 	.probe = octeontx_wdt_probe,
 	.remove = octeontx_wdt_remove,
 	.flags = DM_FLAG_OS_PREPARE,
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 8c87b50c5d2..ca2bc7cfb59 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -263,6 +263,6 @@  U_BOOT_DRIVER(omap3_wdt) = {
 	.of_match = omap3_wdt_ids,
 	.ops = &omap3_wdt_ops,
 	.probe = omap3_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct omap3_wdt_priv),
+	.priv_auto	= sizeof(struct omap3_wdt_priv),
 };
 #endif /* !CONFIG_IS_ENABLED(WDT) */
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index c3576916d32..171d81aec59 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -186,7 +186,7 @@  U_BOOT_DRIVER(orion_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = orion_wdt_ids,
 	.probe = orion_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct orion_wdt_priv),
+	.priv_auto	= sizeof(struct orion_wdt_priv),
 	.ofdata_to_platdata = orion_wdt_ofdata_to_platdata,
 	.ops = &orion_wdt_ops,
 };
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index ebe29c74091..f64a39f6579 100644
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -118,6 +118,6 @@  U_BOOT_DRIVER(rti_wdt) = {
 	.of_match = rti_wdt_ids,
 	.ops = &rti_wdt_ops,
 	.probe = rti_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct rti_wdt_priv),
+	.priv_auto	= sizeof(struct rti_wdt_priv),
 	.flags = DM_FLAG_REMOVE_WITH_PD_ON,
 };
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index e93e0ee3d54..66553e5591b 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -125,7 +125,7 @@  U_BOOT_DRIVER(sbsa_gwdt) = {
 	.id = UCLASS_WDT,
 	.of_match = sbsa_gwdt_ids,
 	.probe = sbsa_gwdt_probe,
-	.priv_auto_alloc_size = sizeof(struct sbsa_gwdt_priv),
+	.priv_auto	= sizeof(struct sbsa_gwdt_priv),
 	.ofdata_to_platdata = sbsa_gwdt_ofdata_to_platdata,
 	.ops = &sbsa_gwdt_ops,
 };
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index aaf93d545e4..df57917f15a 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -142,7 +142,7 @@  U_BOOT_DRIVER(sp805_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = sp805_wdt_ids,
 	.probe = sp805_wdt_probe,
-	.priv_auto_alloc_size = sizeof(struct sp805_wdt_priv),
+	.priv_auto	= sizeof(struct sp805_wdt_priv),
 	.ofdata_to_platdata = sp805_wdt_ofdata_to_platdata,
 	.ops = &sp805_wdt_ops,
 };
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index f673fce327c..53586fdbfc8 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -131,7 +131,7 @@  U_BOOT_DRIVER(stm32mp_wdt) = {
 	.name = "stm32mp-wdt",
 	.id = UCLASS_WDT,
 	.of_match = stm32mp_wdt_match,
-	.priv_auto_alloc_size = sizeof(struct stm32mp_wdt_priv),
+	.priv_auto	= sizeof(struct stm32mp_wdt_priv),
 	.probe = stm32mp_wdt_probe,
 	.ops = &stm32mp_wdt_ops,
 };
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index 721ccdb0f6d..f410a070169 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -123,7 +123,7 @@  U_BOOT_DRIVER(xlnx_wdt) = {
 	.id = UCLASS_WDT,
 	.of_match = xlnx_wdt_ids,
 	.probe = xlnx_wdt_probe,
-	.platdata_auto_alloc_size = sizeof(struct xlnx_wdt_platdata),
+	.platdata_auto	= sizeof(struct xlnx_wdt_platdata),
 	.ofdata_to_platdata = xlnx_wdt_ofdata_to_platdata,
 	.ops = &xlnx_wdt_ops,
 };
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index df55e088bbf..8f96822b78e 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -172,8 +172,8 @@  U_BOOT_DRIVER(xlnx_wwdt) = {
 	.id = UCLASS_WDT,
 	.of_match = xlnx_wwdt_ids,
 	.probe = xlnx_wwdt_probe,
-	.priv_auto_alloc_size = sizeof(struct xlnx_wwdt_priv),
-	.platdata_auto_alloc_size = sizeof(struct xlnx_wwdt_platdata),
+	.priv_auto	= sizeof(struct xlnx_wwdt_priv),
+	.platdata_auto	= sizeof(struct xlnx_wwdt_platdata),
 	.ofdata_to_platdata = xlnx_wwdt_ofdata_to_platdata,
 	.ops = &xlnx_wwdt_ops,
 };
diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c
index 1b3325bbe2a..cbb51d26b91 100644
--- a/drivers/xen/pvblock.c
+++ b/drivers/xen/pvblock.c
@@ -723,7 +723,7 @@  U_BOOT_DRIVER(pvblock_blk) = {
 	.bind			= pvblock_blk_bind,
 	.probe			= pvblock_blk_probe,
 	.remove			= pvblock_blk_remove,
-	.priv_auto_alloc_size	= sizeof(struct blkfront_dev),
+	.priv_auto	= sizeof(struct blkfront_dev),
 	.flags			= DM_FLAG_OS_PREPARE,
 };
 
diff --git a/include/dm/device.h b/include/dm/device.h
index b95aa346820..c380eb3a0df 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -111,7 +111,7 @@  enum {
  * probe method if the device has a device tree node.
  *
  * All three of platdata, priv and uclass_priv can be allocated by the
- * driver, or you can use the auto_alloc_size members of struct driver and
+ * driver, or you can use the 'auto' members of struct driver and
  * struct uclass_driver to have driver model do this automatically.
  *
  * @driver: The driver used by this device
@@ -231,18 +231,18 @@  struct udevice_id {
  * memory allocated but it has not yet been probed.
  * @child_post_remove: Called after a child device is removed. The device
  * has memory allocated but its device_remove() method has been called.
- * @priv_auto_alloc_size: If non-zero this is the size of the private data
+ * @priv_auto: If non-zero this is the size of the private data
  * to be allocated in the device's ->priv pointer. If zero, then the driver
  * is responsible for allocating any data required.
- * @platdata_auto_alloc_size: If non-zero this is the size of the
+ * @platdata_auto: If non-zero this is the size of the
  * platform data to be allocated in the device's ->platdata pointer.
  * This is typically only useful for device-tree-aware drivers (those with
  * an of_match), since drivers which use platdata will have the data
  * provided in the U_BOOT_DEVICE() instantiation.
- * @per_child_auto_alloc_size: Each device can hold private data owned by
+ * @per_child_auto: Each device can hold private data owned by
  * its parent. If required this will be automatically allocated if this
  * value is non-zero.
- * @per_child_platdata_auto_alloc_size: A bus likes to store information about
+ * @per_child_platdata_auto: A bus likes to store information about
  * its children. If non-zero this is the size of this data, to be allocated
  * in the child's parent_platdata pointer.
  * @ops: Driver-specific operations. This is typically a list of function
@@ -264,10 +264,10 @@  struct driver {
 	int (*child_post_bind)(struct udevice *dev);
 	int (*child_pre_probe)(struct udevice *dev);
 	int (*child_post_remove)(struct udevice *dev);
-	int priv_auto_alloc_size;
-	int platdata_auto_alloc_size;
-	int per_child_auto_alloc_size;
-	int per_child_platdata_auto_alloc_size;
+	int priv_auto;
+	int platdata_auto;
+	int per_child_auto;
+	int per_child_platdata_auto;
 	const void *ops;	/* driver-specific operations */
 	uint32_t flags;
 #if CONFIG_IS_ENABLED(ACPIGEN)
diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 69a073a2733..2d9eae19099 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -65,19 +65,19 @@  struct udevice;
  * @child_post_probe: Called after a child in this uclass is probed
  * @init: Called to set up the uclass
  * @destroy: Called to destroy the uclass
- * @priv_auto_alloc_size: If non-zero this is the size of the private data
+ * @priv_auto: If non-zero this is the size of the private data
  * to be allocated in the uclass's ->priv pointer. If zero, then the uclass
  * driver is responsible for allocating any data required.
- * @per_device_auto_alloc_size: Each device can hold private data owned
+ * @per_device_auto: Each device can hold private data owned
  * by the uclass. If required this will be automatically allocated if this
  * value is non-zero.
- * @per_device_platdata_auto_alloc_size: Each device can hold platform data
+ * @per_device_platdata_auto: Each device can hold platform data
  * owned by the uclass as 'dev->uclass_platdata'. If the value is non-zero,
  * then this will be automatically allocated.
- * @per_child_auto_alloc_size: Each child device (of a parent in this
+ * @per_child_auto: Each child device (of a parent in this
  * uclass) can hold parent data for the device/uclass. This value is only
  * used as a fallback if this member is 0 in the driver.
- * @per_child_platdata_auto_alloc_size: A bus likes to store information about
+ * @per_child_platdata_auto: A bus likes to store information about
  * its children. If non-zero this is the size of this data, to be allocated
  * in the child device's parent_platdata pointer. This value is only used as
  * a fallback if this member is 0 in the driver.
@@ -98,11 +98,11 @@  struct uclass_driver {
 	int (*child_post_probe)(struct udevice *dev);
 	int (*init)(struct uclass *class);
 	int (*destroy)(struct uclass *class);
-	int priv_auto_alloc_size;
-	int per_device_auto_alloc_size;
-	int per_device_platdata_auto_alloc_size;
-	int per_child_auto_alloc_size;
-	int per_child_platdata_auto_alloc_size;
+	int priv_auto;
+	int per_device_auto;
+	int per_device_platdata_auto;
+	int per_child_auto;
+	int per_child_platdata_auto;
 	const void *ops;
 	uint32_t flags;
 };
diff --git a/include/dwmmc.h b/include/dwmmc.h
index d8a8355a0ad..c53694654ed 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -256,7 +256,7 @@  static inline u8 dwmci_readb(struct dwmci_host *host, int reg)
  * ...
  *
  * Inside U_BOOT_DRIVER():
- *	.platdata_auto_alloc_size = sizeof(struct rockchip_mmc_plat),
+ *	.platdata_auto	= sizeof(struct rockchip_mmc_plat),
  *
  * To access platform data:
  *	struct rockchip_mmc_plat *plat = dev_get_platdata(dev);
diff --git a/include/sdhci.h b/include/sdhci.h
index 1fd20ec0860..d04afd53b16 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -440,7 +440,7 @@  static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
  * ...
  *
  * Inside U_BOOT_DRIVER():
- *	.platdata_auto_alloc_size = sizeof(struct msm_sdhc_plat),
+ *	.platdata_auto	= sizeof(struct msm_sdhc_plat),
  *
  * To access platform data:
  *	struct msm_sdhc_plat *plat = dev_get_platdata(dev);
diff --git a/include/spi.h b/include/spi.h
index e90110dd13c..a22225d85d0 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -102,7 +102,7 @@  enum spi_polarity {
  *
  * For driver model this is the per-child data used by the SPI bus. It can
  * be accessed using dev_get_parent_priv() on the slave device. The SPI uclass
- * sets uip per_child_auto_alloc_size to sizeof(struct spi_slave), and the
+ * sets up per_child_auto to sizeof(struct spi_slave), and the
  * driver should not override it. Two platform data fields (max_hz and mode)
  * are copied into this structure to provide an initial value. This allows
  * them to be changed, since we should never change platform data in drivers.
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 0e72a68bced..fcd6eb87991 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -196,7 +196,7 @@  U_BOOT_DRIVER(efi_blk) = {
 	.name			= "efi_blk",
 	.id			= UCLASS_BLK,
 	.ops			= &efi_blk_ops,
-	.platdata_auto_alloc_size = sizeof(struct efi_blk_platdata),
+	.platdata_auto	= sizeof(struct efi_blk_platdata),
 };
 
 /* EFI driver operators */
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 4b4aaecf366..2c56b140184 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -598,7 +598,7 @@  UCLASS_DRIVER(eth) = {
 	.pre_unbind	= eth_pre_unbind,
 	.post_probe	= eth_post_probe,
 	.pre_remove	= eth_pre_remove,
-	.priv_auto_alloc_size = sizeof(struct eth_uclass_priv),
-	.per_device_auto_alloc_size = sizeof(struct eth_device_priv),
+	.priv_auto	= sizeof(struct eth_uclass_priv),
+	.per_device_auto	= sizeof(struct eth_device_priv),
 	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 };
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 6674eb6bee7..3fb41840996 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -228,6 +228,6 @@  UCLASS_DRIVER(mdio_mux) = {
 	.child_post_bind = dm_mdio_mux_child_post_bind,
 	.post_bind  = dm_mdio_mux_post_bind,
 	.post_probe = dm_mdio_mux_post_probe,
-	.per_device_auto_alloc_size = sizeof(struct mdio_mux_perdev_priv),
-	.per_child_platdata_auto_alloc_size = sizeof(struct mdio_mux_ch_data),
+	.per_device_auto	= sizeof(struct mdio_mux_perdev_priv),
+	.per_child_platdata_auto	= sizeof(struct mdio_mux_ch_data),
 };
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index b5e8e465123..d062382c2a9 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -216,5 +216,5 @@  UCLASS_DRIVER(mdio) = {
 	.post_bind  = dm_mdio_post_bind,
 	.post_probe = dm_mdio_post_probe,
 	.pre_remove = dm_mdio_pre_remove,
-	.per_device_auto_alloc_size = sizeof(struct mdio_perdev_priv),
+	.per_device_auto	= sizeof(struct mdio_perdev_priv),
 };
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 021f776845e..c4fcdbbf4d4 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 27dd066350e..0919b3dba04 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,
@@ -313,19 +313,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;
 }
@@ -457,18 +457,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 0514813b817..e9168ec1930 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 141fd4d9083..45154cea500 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 2effef3c1c8..22a293096c9 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 08bdf011946..5c074cdd09f 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 c4de91da102..d69579846b2 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 760731b0667..94c2753ed95 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),
 };