iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: rawnand: davinci: Use uintptr_t casts instead of unsigned ones

Browse Source 
uintptr_t should be used when casting a pointer to an unsigned int so
that the code compiles without warnings even on 64-bit architectures.

This is needed if we want to allow selection of this driver when
COMPILE_TEST=y.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Boris Brezillon
2018-07-09 22:09:29 +02:00
committed by Miquel Raynal
parent c5b76d8dd2
commit cc53d5ca38
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mtd/nand/raw/davinci_nand.c
View File

@ -318,7 +318,7 @@ static int nand_davinci_correct_4bit(struct mtd_info *mtd,
/* Unpack ten bytes into eight 10 bit values. We know we're /* Unpack ten bytes into eight 10 bit values. We know we're
* little-endian, and use type punning for less shifting/masking. * little-endian, and use type punning for less shifting/masking.
*/ */
if (WARN_ON(0x01 & (unsigned) ecc_code)) if (WARN_ON(0x01 & (uintptr_t)ecc_code))
return -EINVAL; return -EINVAL;
ecc16 = (unsigned short *)ecc_code; ecc16 = (unsigned short *)ecc_code;
@ -440,9 +440,9 @@ static void nand_davinci_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
{ {
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
if ((0x03 & ((unsigned)buf)) == 0 && (0x03 & len) == 0) if ((0x03 & ((uintptr_t)buf)) == 0 && (0x03 & len) == 0)
ioread32_rep(chip->IO_ADDR_R, buf, len >> 2); ioread32_rep(chip->IO_ADDR_R, buf, len >> 2);
else if ((0x01 & ((unsigned)buf)) == 0 && (0x01 & len) == 0) else if ((0x01 & ((uintptr_t)buf)) == 0 && (0x01 & len) == 0)
ioread16_rep(chip->IO_ADDR_R, buf, len >> 1); ioread16_rep(chip->IO_ADDR_R, buf, len >> 1);
else else
ioread8_rep(chip->IO_ADDR_R, buf, len); ioread8_rep(chip->IO_ADDR_R, buf, len);
@ -453,9 +453,9 @@ static void nand_davinci_write_buf(struct mtd_info *mtd,
{ {
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
if ((0x03 & ((unsigned)buf)) == 0 && (0x03 & len) == 0) if ((0x03 & ((uintptr_t)buf)) == 0 && (0x03 & len) == 0)
iowrite32_rep(chip->IO_ADDR_R, buf, len >> 2); iowrite32_rep(chip->IO_ADDR_R, buf, len >> 2);
else if ((0x01 & ((unsigned)buf)) == 0 && (0x01 & len) == 0) else if ((0x01 & ((uintptr_t)buf)) == 0 && (0x01 & len) == 0)
iowrite16_rep(chip->IO_ADDR_R, buf, len >> 1); iowrite16_rep(chip->IO_ADDR_R, buf, len >> 1);
else else
iowrite8_rep(chip->IO_ADDR_R, buf, len); iowrite8_rep(chip->IO_ADDR_R, buf, len);