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/net/pcnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/pcnet.c') 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, }; -- 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/net/pcnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/pcnet.c') diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index 9b27033e792..ff9506f3912 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -690,7 +690,7 @@ U_BOOT_DRIVER(eth_pcnet) = { .probe = pcnet_probe, .ops = &pcnet_ops, .priv_auto = sizeof(struct pcnet_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_UC_FLAG_ALLOC_PRIV_DMA, }; -- 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/net/pcnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/pcnet.c') diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index ff9506f3912..59ef1043349 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -585,7 +585,7 @@ int pcnet_initialize(struct bd_info *bis) #else /* DM_ETH */ static int pcnet_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct pcnet_priv *priv = dev_get_priv(dev); memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -638,7 +638,7 @@ static int pcnet_bind(struct udevice *dev) static int pcnet_probe(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct pcnet_priv *lp = dev_get_priv(dev); u16 command, status; u32 iobase; -- cgit v1.2.3