From f25146afc5a90bdaa5b518d05eda40410f6744a2 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Wed, 8 Mar 2017 22:41:11 +0000 Subject: uImage: use 'char *' instead of 'unsigned char *' for uImage_load() This was only ever used on PPC, where they are equivalent and we never saw the resulting -Wpointer-sign warnings. Signed-off-by: David Woodhouse Signed-off-by: Simon Horman --- kexec/arch/ppc/kexec-uImage-ppc.c | 2 +- kexec/kexec-uImage.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kexec') diff --git a/kexec/arch/ppc/kexec-uImage-ppc.c b/kexec/arch/ppc/kexec-uImage-ppc.c index c89a1a7..5eec6e4 100644 --- a/kexec/arch/ppc/kexec-uImage-ppc.c +++ b/kexec/arch/ppc/kexec-uImage-ppc.c @@ -55,7 +55,7 @@ char *slurp_ramdisk_ppc(const char *filename, off_t *r_size) { struct Image_info img; off_t size; - const unsigned char *buf = slurp_file(filename, &size); + const char *buf = slurp_file(filename, &size); int rc; /* Check if this is a uImage RAMDisk */ diff --git a/kexec/kexec-uImage.c b/kexec/kexec-uImage.c index 49f266a..2740a26 100644 --- a/kexec/kexec-uImage.c +++ b/kexec/kexec-uImage.c @@ -136,7 +136,7 @@ int uImage_probe_ramdisk(const unsigned char *buf, off_t len, unsigned int arch) #define COMMENT 0x10 /* bit 4 set: file comment present */ #define RESERVED 0xE0 /* bits 5..7: reserved */ -static int uImage_gz_load(const unsigned char *buf, off_t len, +static int uImage_gz_load(const char *buf, off_t len, struct Image_info *image) { int ret; @@ -225,14 +225,14 @@ static int uImage_gz_load(const unsigned char *buf, off_t len, return 0; } #else -static int uImage_gz_load(const unsigned char *UNUSED(buf), off_t UNUSED(len), +static int uImage_gz_load(const char *UNUSED(buf), off_t UNUSED(len), struct Image_info *UNUSED(image)) { return -1; } #endif -int uImage_load(const unsigned char *buf, off_t len, struct Image_info *image) +int uImage_load(const char *buf, off_t len, struct Image_info *image) { const struct image_header *header = (const struct image_header *)buf; const unsigned char *img_buf = buf + sizeof(struct image_header); -- cgit