spl_mmc: cleanup variable types
PATCH 1/1 spl_mmc: cleanup variable types
block_read returns unsigned long, so it doesn't make sense to check for < 0. and neither does marking the header structure as const and then casting away the constness to load data into it.
Also cleanup some unneeded pointer casting while we're at it.
--- drivers/mmc/spl_mmc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/mmc/spl_mmc.c +9 -8
@@ -34,8 +34,9 @@ DECLARE_GLOBAL_DATA_PTR;static void mmc_load_image_raw (struct mmc *mmc) { -u32 image_size_sectors, err; -const struct image_header *header; +unsigned long err; +u32 image_size_sectors; +struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -sizeof (struct image_header ));
@@ -43,9 +44,9 @@ static void mmc_load_image_raw(struct mmc *mmc)/* read image header to find the image size & load address */ err = mmc->block_dev.block_read (0 ,CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR ,1 , - (void *)header); + header); -if (err <=0 ) +if (err ==0 ) goto end;spl_parse_image_header (header);
@@ -60,8 +61,8 @@ static void mmc_load_image_raw(struct mmc *mmc) image_size_sectors, (void *)spl_image.load_addr); end: -if (err <=0 ) { -printf ("spl: mmc blk read err - %d\n" , err); +if (err ==0 ) { +printf ("spl: mmc blk read err - %lu\n" , err);hang (); } }
@@ -69,7 +70,7 @@ end:#ifdef CONFIG_SPL_FAT_SUPPORT static void mmc_load_image_fat (struct mmc *mmc) { -s32 err; +int err;struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
@@ -83,7 +84,7 @@ static void mmc_load_image_fat(struct mmc *mmc) } err =file_fat_read (CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME , - (u8 *)header,sizeof (struct image_header )); + header,sizeof (struct image_header ));if (err <=0 ) goto end;
Signature · 1 line
1.7.10.4
PATCH 1/1 spl_mmc: cleanup variable types
Quoted 7 lines · Peter Korsgaard
block_readreturns unsigned long, so it doesn't make sense to check for < 0. and neither does marking the header structure as const and then casting away the constness to load data into it.Also cleanup some unneeded pointer casting while we're at it.
Signed-off-by Peter Korsgaard <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130321/81b826e1/attachment.pgp>
Quoted 8 lines · Peter Korsgaard
block_readreturns unsigned long, so it doesn't make sense to check for < 0. and neither does marking the header structure as const and then casting away the constness to load data into it.Also cleanup some unneeded pointer casting while we're at it.
Signed-off-by Peter Korsgaard <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130502/23c5cbe9/attachment.pgp>