mtd: mtdpart: Change size type from fdt_addr_t to fdt_size_t
PATCH 1/1 mtd: mtdpart: Change size type from fdt_addr_t to fdt_size_t
Set correct type for 3rd argument of ofnode_get_addr_size_index_notrans() function. It expects fdt_size_t * and not fdt_addr_t *.
When these two types do not have same size then U-Boot throw compile warning:
drivers/mtd/mtdpart.c: In function ‘add_mtd_partitions_of’:
drivers/mtd/mtdpart.c:906:57: warning: passing argument 3 of ‘ofnode_get_addr_size_index_notrans’ from incompatible pointer type [-Wincompatible-pointer-types]
offset = ofnode_get_addr_size_index_notrans(child, 0, &size);
^~~~~
In file included from include/dm/device.h:13,
from include/linux/mtd/mtd.h:26,
from include/ubi_uboot.h:28,
from drivers/mtd/mtdpart.c:27:
include/dm/ofnode.h:530:25: note: expected ‘fdt_size_t *’ {aka ‘long long unsigned int *’} but argument is of type ‘fdt_addr_t *’ {aka ‘long unsigned int *’}
fdt_size_t *size);
~~~~~~~~~~~~^~~~Signed-off-by Pali Rohár <[email protected]>
--- drivers/mtd/mtdpart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/mtdpart.c +2 -1
@@ -898,7 +898,8 @@ int add_mtd_partitions_of(struct mtd_info *master)ofnode_for_each_subnode (child, parts) {struct mtd_partition part = {0 };struct mtd_info *slave; -fdt_addr_t offset, size; +fdt_addr_t offset; +fdt_size_t size;if (!ofnode_is_available (child))continue ;
Signature · 1 line
2.20.1
Quoted 18 lines · On Fri, 13 May 2022 22:24:51 +0200 Pali Rohár <[email protected]> wrote:
Set correct type for 3rd argument of
ofnode_get_addr_size_index_notrans()function. It expectsfdt_size_t* and notfdt_addr_t*.When these two types do not have same size then U-Boot throw compile warning:
drivers/mtd/mtdpart.c: In function ‘add_mtd_partitions_of’: drivers/mtd/mtdpart.c:906:57: warning: passing argument 3 of ‘ofnode_get_addr_size_index_notrans’ from incompatible pointer type [-Wincompatible-pointer-types] offset = ofnode_get_addr_size_index_notrans(child, 0, &size); ^~~~~ In file included from include/dm/device.h:13, from include/linux/mtd/mtd.h:26, from include/ubi_uboot.h:28, from drivers/mtd/mtdpart.c:27: include/dm/ofnode.h:530:25: note: expected ‘fdt_size_t *’ {aka ‘long long unsigned int *’} but argument is of type ‘fdt_addr_t *’ {aka ‘long unsigned int *’} fdt_size_t *size); ~~~~~~~~~~~~^~~~
Quoted 1 line
Signed-off-by Pali Rohár <[email protected]>
Reviewed-by Marek Behún <[email protected]>
Quoted 18 lines · Pali Rohár
Set correct type for 3rd argument of
ofnode_get_addr_size_index_notrans()function. It expectsfdt_size_t* and notfdt_addr_t*.When these two types do not have same size then U-Boot throw compile warning:
drivers/mtd/mtdpart.c: In function ‘add_mtd_partitions_of’: drivers/mtd/mtdpart.c:906:57: warning: passing argument 3 of ‘ofnode_get_addr_size_index_notrans’ from incompatible pointer type [-Wincompatible-pointer-types] offset = ofnode_get_addr_size_index_notrans(child, 0, &size); ^~~~~ In file included from include/dm/device.h:13, from include/linux/mtd/mtd.h:26, from include/ubi_uboot.h:28, from drivers/mtd/mtdpart.c:27: include/dm/ofnode.h:530:25: note: expected ‘fdt_size_t *’ {aka ‘long long unsigned int *’} but argument is of type ‘fdt_addr_t *’ {aka ‘long unsigned int *’} fdt_size_t *size); ~~~~~~~~~~~~^~~~
Quoted 2 lines
Signed-off-by Pali Rohár <[email protected]>Reviewed-by Marek Behún <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom