From 41575d8e4c334df148c4cdd7c40cc825dc0fcaa1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Dec 2020 16:55:17 -0700 Subject: dm: treewide: Rename auto_alloc_size members to be shorter This construct is quite long-winded. In earlier days it made some sense since auto-allocation was a strange concept. But with driver model now used pretty universally, we can shorten this to 'auto'. This reduces verbosity and makes it easier to read. Coincidentally it also ensures that every declaration is on one line, thus making dtoc's job easier. Signed-off-by: Simon Glass --- drivers/ddr/altera/sdram_gen5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/ddr/altera/sdram_gen5.c') 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 */ -- cgit v1.2.3 From caa4daa2ae3dc0a3e516addea5772c9af76abcb0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Dec 2020 16:55:18 -0700 Subject: dm: treewide: Rename 'platdata' variables to just 'plat' We use 'priv' for private data but often use 'platdata' for platform data. We can't really use 'pdata' since that is ambiguous (it could mean private or platform data). Rename some of the latter variables to end with 'plat' for consistency. Signed-off-by: Simon Glass --- drivers/ddr/altera/sdram_gen5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/ddr/altera/sdram_gen5.c') diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 4c118f0846a..e7c9b7a18ab 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -565,7 +565,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl) static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev) { - struct altera_gen5_sdram_platdata *plat = dev->platdata; + struct altera_gen5_sdram_platdata *plat = dev->plat; plat->sdr = (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0); if (!plat->sdr) @@ -578,7 +578,7 @@ static int altera_gen5_sdram_probe(struct udevice *dev) { int ret; unsigned long sdram_size; - struct altera_gen5_sdram_platdata *plat = dev->platdata; + struct altera_gen5_sdram_platdata *plat = dev->plat; struct altera_gen5_sdram_priv *priv = dev_get_priv(dev); struct socfpga_sdr_ctrl *sdr_ctrl = &plat->sdr->sdr_ctrl; struct reset_ctl_bulk resets; @@ -647,7 +647,7 @@ 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 = sizeof(struct altera_gen5_sdram_platdata), + .plat_auto = sizeof(struct altera_gen5_sdram_platdata), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), }; -- cgit v1.2.3 From d1998a9fde0a917d6496299f6a97b6bccfdc6724 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Dec 2020 16:55:21 -0700 Subject: dm: treewide: Rename ofdata_to_platdata() to of_to_plat() This name is far too long. Rename it to remove the 'data' bits. This makes it consistent with the platdata->plat rename. Signed-off-by: Simon Glass --- drivers/ddr/altera/sdram_gen5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/ddr/altera/sdram_gen5.c') diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index e7c9b7a18ab..286961ca336 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -563,7 +563,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl) return temp; } -static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev) +static int altera_gen5_sdram_of_to_plat(struct udevice *dev) { struct altera_gen5_sdram_platdata *plat = dev->plat; @@ -646,7 +646,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .id = UCLASS_RAM, .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, - .ofdata_to_platdata = altera_gen5_sdram_ofdata_to_platdata, + .of_to_plat = altera_gen5_sdram_of_to_plat, .plat_auto = sizeof(struct altera_gen5_sdram_platdata), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), -- cgit v1.2.3 From 8a8d24bdf174851ebb8607f359d54b72e3283b97 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Dec 2020 16:55:23 -0700 Subject: dm: treewide: Rename ..._platdata variables to just ..._plat Try to maintain some consistency between these variables by using _plat as a suffix for them. Signed-off-by: Simon Glass --- drivers/ddr/altera/sdram_gen5.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/ddr/altera/sdram_gen5.c') diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 286961ca336..3ffe057543f 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -27,7 +27,7 @@ struct altera_gen5_sdram_priv { struct ram_info info; }; -struct altera_gen5_sdram_platdata { +struct altera_gen5_sdram_plat { struct socfpga_sdr *sdr; }; @@ -565,7 +565,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl) static int altera_gen5_sdram_of_to_plat(struct udevice *dev) { - struct altera_gen5_sdram_platdata *plat = dev->plat; + struct altera_gen5_sdram_plat *plat = dev->plat; plat->sdr = (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0); if (!plat->sdr) @@ -578,7 +578,7 @@ static int altera_gen5_sdram_probe(struct udevice *dev) { int ret; unsigned long sdram_size; - struct altera_gen5_sdram_platdata *plat = dev->plat; + struct altera_gen5_sdram_plat *plat = dev->plat; struct altera_gen5_sdram_priv *priv = dev_get_priv(dev); struct socfpga_sdr_ctrl *sdr_ctrl = &plat->sdr->sdr_ctrl; struct reset_ctl_bulk resets; @@ -647,7 +647,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, .of_to_plat = altera_gen5_sdram_of_to_plat, - .plat_auto = sizeof(struct altera_gen5_sdram_platdata), + .plat_auto = sizeof(struct altera_gen5_sdram_plat), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), }; -- cgit v1.2.3