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/rng/stm32mp1_rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/rng/stm32mp1_rng.c') 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, }; -- 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/rng/stm32mp1_rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/rng/stm32mp1_rng.c') diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 4eed1de8adc..abfcbab6630 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 = sizeof(struct stm32_rng_platdata), + .plat_auto = sizeof(struct stm32_rng_platdata), .ofdata_to_platdata = stm32_rng_ofdata_to_platdata, }; -- cgit v1.2.3 From c69cda25c9b59e53a6bc8969ada58942549f5b5d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Dec 2020 16:55:20 -0700 Subject: dm: treewide: Rename dev_get_platdata() to dev_get_plat() Rename this to be consistent with the change from 'platdata'. Signed-off-by: Simon Glass --- drivers/rng/stm32mp1_rng.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/rng/stm32mp1_rng.c') diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index abfcbab6630..34281d39464 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -41,7 +41,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) int retval, i; u32 sr, count, reg; size_t increment; - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev); while (len > 0) { retval = readl_poll_timeout(pdata->base + RNG_SR, sr, @@ -106,7 +106,7 @@ static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata) static int stm32_rng_probe(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev); reset_assert(&pdata->rst); udelay(20); @@ -117,14 +117,14 @@ static int stm32_rng_probe(struct udevice *dev) static int stm32_rng_remove(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev); return stm32_rng_cleanup(pdata); } static int stm32_rng_ofdata_to_platdata(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev); int err; pdata->base = dev_read_addr(dev); -- 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/rng/stm32mp1_rng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/rng/stm32mp1_rng.c') diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 34281d39464..30505ee7fc6 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -122,7 +122,7 @@ static int stm32_rng_remove(struct udevice *dev) return stm32_rng_cleanup(pdata); } -static int stm32_rng_ofdata_to_platdata(struct udevice *dev) +static int stm32_rng_of_to_plat(struct udevice *dev) { struct stm32_rng_platdata *pdata = dev_get_plat(dev); int err; @@ -161,5 +161,5 @@ U_BOOT_DRIVER(stm32_rng) = { .probe = stm32_rng_probe, .remove = stm32_rng_remove, .plat_auto = sizeof(struct stm32_rng_platdata), - .ofdata_to_platdata = stm32_rng_ofdata_to_platdata, + .of_to_plat = stm32_rng_of_to_plat, }; -- 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/rng/stm32mp1_rng.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/rng/stm32mp1_rng.c') diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 30505ee7fc6..8ea00e3e890 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -30,7 +30,7 @@ #define RNG_DR 0x08 -struct stm32_rng_platdata { +struct stm32_rng_plat { fdt_addr_t base; struct clk clk; struct reset_ctl rst; @@ -41,7 +41,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) int retval, i; u32 sr, count, reg; size_t increment; - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); while (len > 0) { retval = readl_poll_timeout(pdata->base + RNG_SR, sr, @@ -80,7 +80,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) return 0; } -static int stm32_rng_init(struct stm32_rng_platdata *pdata) +static int stm32_rng_init(struct stm32_rng_plat *pdata) { int err; @@ -97,7 +97,7 @@ static int stm32_rng_init(struct stm32_rng_platdata *pdata) return 0; } -static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata) +static int stm32_rng_cleanup(struct stm32_rng_plat *pdata) { writel(0, pdata->base + RNG_CR); @@ -106,7 +106,7 @@ static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata) static int stm32_rng_probe(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); reset_assert(&pdata->rst); udelay(20); @@ -117,14 +117,14 @@ static int stm32_rng_probe(struct udevice *dev) static int stm32_rng_remove(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); return stm32_rng_cleanup(pdata); } static int stm32_rng_of_to_plat(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); int err; pdata->base = dev_read_addr(dev); @@ -160,6 +160,6 @@ U_BOOT_DRIVER(stm32_rng) = { .ops = &stm32_rng_ops, .probe = stm32_rng_probe, .remove = stm32_rng_remove, - .plat_auto = sizeof(struct stm32_rng_platdata), + .plat_auto = sizeof(struct stm32_rng_plat), .of_to_plat = stm32_rng_of_to_plat, }; -- cgit v1.2.3