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/timer/altera_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/timer/altera_timer.c') 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, }; -- 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/timer/altera_timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/timer/altera_timer.c') diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index ad50380f04d..4579717ee5d 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -34,7 +34,7 @@ struct altera_timer_platdata { static u64 altera_timer_get_count(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->platdata; + struct altera_timer_platdata *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; u32 val; @@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev) static int altera_timer_probe(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->platdata; + struct altera_timer_platdata *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; writel(0, ®s->status); @@ -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 = sizeof(struct altera_timer_platdata), + .plat_auto = sizeof(struct altera_timer_platdata), .probe = altera_timer_probe, .ops = &altera_timer_ops, }; -- 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/timer/altera_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/timer/altera_timer.c') diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 4579717ee5d..1daa0eac5c1 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -65,7 +65,7 @@ static int altera_timer_probe(struct udevice *dev) static int altera_timer_ofdata_to_platdata(struct udevice *dev) { - struct altera_timer_platdata *plat = dev_get_platdata(dev); + struct altera_timer_platdata *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_timer_regs), -- 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/timer/altera_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/timer/altera_timer.c') diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 1daa0eac5c1..a8d6ba53b89 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -63,7 +63,7 @@ static int altera_timer_probe(struct udevice *dev) return 0; } -static int altera_timer_ofdata_to_platdata(struct udevice *dev) +static int altera_timer_of_to_plat(struct udevice *dev) { struct altera_timer_platdata *plat = dev_get_plat(dev); @@ -87,7 +87,7 @@ U_BOOT_DRIVER(altera_timer) = { .name = "altera_timer", .id = UCLASS_TIMER, .of_match = altera_timer_ids, - .ofdata_to_platdata = altera_timer_ofdata_to_platdata, + .of_to_plat = altera_timer_of_to_plat, .plat_auto = sizeof(struct altera_timer_platdata), .probe = altera_timer_probe, .ops = &altera_timer_ops, -- 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/timer/altera_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/timer/altera_timer.c') diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index a8d6ba53b89..7e9abee0efc 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -28,13 +28,13 @@ struct altera_timer_regs { u32 snaph; /* Snapshot high */ }; -struct altera_timer_platdata { +struct altera_timer_plat { struct altera_timer_regs *regs; }; static u64 altera_timer_get_count(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->plat; + struct altera_timer_plat *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; u32 val; @@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev) static int altera_timer_probe(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->plat; + struct altera_timer_plat *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; writel(0, ®s->status); @@ -65,7 +65,7 @@ static int altera_timer_probe(struct udevice *dev) static int altera_timer_of_to_plat(struct udevice *dev) { - struct altera_timer_platdata *plat = dev_get_plat(dev); + struct altera_timer_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_timer_regs), @@ -88,7 +88,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = altera_timer_ids, .of_to_plat = altera_timer_of_to_plat, - .plat_auto = sizeof(struct altera_timer_platdata), + .plat_auto = sizeof(struct altera_timer_plat), .probe = altera_timer_probe, .ops = &altera_timer_ops, }; -- cgit v1.2.3 From 0fd3d91152df5bb6c5f7b9ee68f01a9a1c9a875d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 22 Dec 2020 19:30:28 -0700 Subject: dm: Use access methods for dev/uclass private data Most drivers use these access methods but a few do not. Update them. In some cases the access is not permitted, so mark those with a FIXME tag for the maintainer to check. Signed-off-by: Simon Glass Acked-by: Andy Shevchenko Acked-by: Pratyush Yadav --- drivers/timer/altera_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/timer/altera_timer.c') diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 7e9abee0efc..040dc65f48a 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -34,7 +34,7 @@ struct altera_timer_plat { static u64 altera_timer_get_count(struct udevice *dev) { - struct altera_timer_plat *plat = dev->plat; + struct altera_timer_plat *plat = dev_get_plat(dev); struct altera_timer_regs *const regs = plat->regs; u32 val; @@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev) static int altera_timer_probe(struct udevice *dev) { - struct altera_timer_plat *plat = dev->plat; + struct altera_timer_plat *plat = dev_get_plat(dev); struct altera_timer_regs *const regs = plat->regs; writel(0, ®s->status); -- cgit v1.2.3