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/misc/fs_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/misc/fs_loader.c') 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) = { -- 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/misc/fs_loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/misc/fs_loader.c') diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 71e20a49278..b149a27b082 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -161,7 +161,7 @@ static int fw_get_filesystem_firmware(struct udevice *dev) else ret = -ENODEV; } else { - ret = select_fs_dev(dev->platdata); + ret = select_fs_dev(dev->plat); } if (ret) @@ -228,7 +228,7 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev) if (ofnode_valid(fs_loader_node)) { struct device_platdata *plat; - plat = dev->platdata; + plat = dev->plat; if (!ofnode_read_u32_array(fs_loader_node, "phandlepart", phandlepart, 2)) { @@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) int ret; - struct device_platdata *plat = dev->platdata; + struct device_platdata *plat = dev->plat; if (plat->phandlepart.phandle) { ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); @@ -285,7 +285,7 @@ U_BOOT_DRIVER(fs_loader) = { .of_match = fs_loader_ids, .probe = fs_loader_probe, .ofdata_to_platdata = fs_loader_ofdata_to_platdata, - .platdata_auto = sizeof(struct device_platdata), + .plat_auto = sizeof(struct device_platdata), .priv_auto = sizeof(struct firmware), }; -- 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/misc/fs_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/misc/fs_loader.c') diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index b149a27b082..c228e84fa1f 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -219,7 +219,7 @@ int request_firmware_into_buf(struct udevice *dev, return ret; } -static int fs_loader_ofdata_to_platdata(struct udevice *dev) +static int fs_loader_of_to_plat(struct udevice *dev) { u32 phandlepart[2]; @@ -284,7 +284,7 @@ U_BOOT_DRIVER(fs_loader) = { .id = UCLASS_FS_FIRMWARE_LOADER, .of_match = fs_loader_ids, .probe = fs_loader_probe, - .ofdata_to_platdata = fs_loader_ofdata_to_platdata, + .of_to_plat = fs_loader_of_to_plat, .plat_auto = sizeof(struct device_platdata), .priv_auto = sizeof(struct firmware), }; -- 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/misc/fs_loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/misc/fs_loader.c') diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index c228e84fa1f..5ed8ab6530f 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -61,7 +61,7 @@ static int mount_ubifs(char *mtdpart, char *ubivol) } #endif -static int select_fs_dev(struct device_platdata *plat) +static int select_fs_dev(struct device_plat *plat) { int ret; @@ -226,7 +226,7 @@ static int fs_loader_of_to_plat(struct udevice *dev) ofnode fs_loader_node = dev_ofnode(dev); if (ofnode_valid(fs_loader_node)) { - struct device_platdata *plat; + struct device_plat *plat; plat = dev->plat; if (!ofnode_read_u32_array(fs_loader_node, @@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) int ret; - struct device_platdata *plat = dev->plat; + struct device_plat *plat = dev->plat; if (plat->phandlepart.phandle) { ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); @@ -285,7 +285,7 @@ U_BOOT_DRIVER(fs_loader) = { .of_match = fs_loader_ids, .probe = fs_loader_probe, .of_to_plat = fs_loader_of_to_plat, - .plat_auto = sizeof(struct device_platdata), + .plat_auto = sizeof(struct device_plat), .priv_auto = sizeof(struct firmware), }; -- 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/misc/fs_loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/misc/fs_loader.c') diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 5ed8ab6530f..f460b1a64c8 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -161,7 +161,7 @@ static int fw_get_filesystem_firmware(struct udevice *dev) else ret = -ENODEV; } else { - ret = select_fs_dev(dev->plat); + ret = select_fs_dev(dev_get_plat(dev)); } if (ret) @@ -228,7 +228,7 @@ static int fs_loader_of_to_plat(struct udevice *dev) if (ofnode_valid(fs_loader_node)) { struct device_plat *plat; - plat = dev->plat; + plat = dev_get_plat(dev); if (!ofnode_read_u32_array(fs_loader_node, "phandlepart", phandlepart, 2)) { @@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) int ret; - struct device_plat *plat = dev->plat; + struct device_plat *plat = dev_get_plat(dev); if (plat->phandlepart.phandle) { ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); -- cgit v1.2.3