| Message ID | 20201207081851.16107-1-jh80.chung@samsung.com |
|---|---|
| State | Accepted |
| Commit | a0b74acb9b4a21405e7441c808d538a460a3678f |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
| Series | common: splash_source: fix -Wint-to-pointer-cast warning | expand |
On Mon, 7 Dec 2020 at 01:18, Jaehoon Chung <jh80.chung@samsung.com> wrote: > > Fix -Wint-to-pointer-cast warning > > common/splash_source.c: In function 'splash_load_raw': > common/splash_source.c:100:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > 100 | bmp_hdr = (struct bmp_header *)bmp_load_addr; > | ^ > common/splash_source.c: In function 'splash_sf_read_raw': > common/splash_source.c:39:47: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > 39 | return spi_flash_read(sf, offset, read_size, (void *)bmp_load_addr); > | ^ > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > --- > common/splash_source.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On 12/13/20 12:39 AM, Simon Glass wrote: > On Mon, 7 Dec 2020 at 01:18, Jaehoon Chung <jh80.chung@samsung.com> wrote: >> >> Fix -Wint-to-pointer-cast warning >> >> common/splash_source.c: In function 'splash_load_raw': >> common/splash_source.c:100:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] >> 100 | bmp_hdr = (struct bmp_header *)bmp_load_addr; >> | ^ >> common/splash_source.c: In function 'splash_sf_read_raw': >> common/splash_source.c:39:47: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] >> 39 | return spi_flash_read(sf, offset, read_size, (void *)bmp_load_addr); >> | ^ >> >> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> >> --- >> common/splash_source.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> > > Reviewed-by: Simon Glass <sjg@chromium.org> Ping. Is there any progress about this patch? Best Regards, Jaehoon Chung >
On Mon, 7 Dec 2020 17:18:51 +0900 Jaehoon Chung jh80.chung@samsung.com wrote: ... > --- > common/splash_source.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to u-boot-video/master, thanks! -- Anatolij
diff --git a/common/splash_source.c b/common/splash_source.c index f51ca5ddf37c..e50bdfe99c6a 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -36,7 +36,7 @@ static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size) return -ENODEV; } - return spi_flash_read(sf, offset, read_size, (void *)bmp_load_addr); + return spi_flash_read(sf, offset, read_size, (void *)(uintptr_t)bmp_load_addr); } #else static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size) @@ -97,7 +97,7 @@ static int splash_load_raw(struct splash_location *location, u32 bmp_load_addr) if (res < 0) return res; - bmp_hdr = (struct bmp_header *)bmp_load_addr; + bmp_hdr = (struct bmp_header *)(uintptr_t)bmp_load_addr; bmp_size = le32_to_cpu(bmp_hdr->file_size); if (bmp_load_addr + bmp_size >= gd->start_addr_sp)
Fix -Wint-to-pointer-cast warning common/splash_source.c: In function 'splash_load_raw': common/splash_source.c:100:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 100 | bmp_hdr = (struct bmp_header *)bmp_load_addr; | ^ common/splash_source.c: In function 'splash_sf_read_raw': common/splash_source.c:39:47: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 39 | return spi_flash_read(sf, offset, read_size, (void *)bmp_load_addr); | ^ Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- common/splash_source.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)