| Message ID | 20180709155730.2422841-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] mtd: rawnand: davinci: fix build testing on 64-bit | expand |
Hi Arnd, On Mon, 9 Jul 2018 17:57:02 +0200 Arnd Bergmann <arnd@arndb.de> wrote: > Now that we can build this driver everywhere, we run into a couple > of warnings like: > > drivers/mtd/nand/raw/davinci_nand.c: In function 'nand_davinci_correct_4bit': > drivers/mtd/nand/raw/davinci_nand.c:322:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] > > In all cases, this is harmless and we just need to cast to an uintptr_t > rather than an unsigned 32-bit integer. > > Fixes: 347af8918e8a ("mtd: rawnand: davinci: Allow selection of this driver when COMPILE_TEST=y") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Actually, I have all those fixes in my nand/api-cleanup branch [1]. I was planning on sending a v2 of my COMPILE_TEST series to address those problems before activating COMPILE_TEST on those drivers (Miquel already dropped the patches activating COMPILE_TEST on sunxi, davinci and atmel). Regards, Boris [1]https://github.com/bbrezillon/linux-0day/commits/nand/api-cleanup > --- > drivers/mtd/nand/raw/davinci_nand.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c > index cd12e5abafde..c638bd60eb0b 100644 > --- a/drivers/mtd/nand/raw/davinci_nand.c > +++ b/drivers/mtd/nand/raw/davinci_nand.c > @@ -102,7 +102,7 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, > unsigned int ctrl) > { > struct davinci_nand_info *info = to_davinci_nand(mtd); > - uint32_t addr = info->current_cs; > + uintptr_t addr = info->current_cs; > struct nand_chip *nand = mtd_to_nand(mtd); > > /* Did the control lines change? */ > @@ -122,7 +122,7 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, > static void nand_davinci_select_chip(struct mtd_info *mtd, int chip) > { > struct davinci_nand_info *info = to_davinci_nand(mtd); > - uint32_t addr = info->ioaddr; > + uintptr_t addr = info->ioaddr; > > /* maybe kick in a second chipselect */ > if (chip > 0) > @@ -319,7 +319,7 @@ static int nand_davinci_correct_4bit(struct mtd_info *mtd, > /* Unpack ten bytes into eight 10 bit values. We know we're > * 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; > ecc16 = (unsigned short *)ecc_code; > > @@ -441,9 +441,9 @@ static void nand_davinci_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) > { > 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); > - 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); > else > ioread8_rep(chip->IO_ADDR_R, buf, len); > @@ -454,9 +454,9 @@ static void nand_davinci_write_buf(struct mtd_info *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); > - 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); > else > iowrite8_rep(chip->IO_ADDR_R, buf, len); > @@ -680,7 +680,7 @@ static int nand_davinci_probe(struct platform_device *pdev) > info->chip.bbt_md = pdata->bbt_md; > info->timing = pdata->timing; > > - info->ioaddr = (uint32_t __force) vaddr; > + info->ioaddr = (uintptr_t __force) vaddr; > > info->current_cs = info->ioaddr; > info->core_chipsel = pdata->core_chipsel;
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index cd12e5abafde..c638bd60eb0b 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -102,7 +102,7 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) { struct davinci_nand_info *info = to_davinci_nand(mtd); - uint32_t addr = info->current_cs; + uintptr_t addr = info->current_cs; struct nand_chip *nand = mtd_to_nand(mtd); /* Did the control lines change? */ @@ -122,7 +122,7 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, static void nand_davinci_select_chip(struct mtd_info *mtd, int chip) { struct davinci_nand_info *info = to_davinci_nand(mtd); - uint32_t addr = info->ioaddr; + uintptr_t addr = info->ioaddr; /* maybe kick in a second chipselect */ if (chip > 0) @@ -319,7 +319,7 @@ static int nand_davinci_correct_4bit(struct mtd_info *mtd, /* Unpack ten bytes into eight 10 bit values. We know we're * 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; ecc16 = (unsigned short *)ecc_code; @@ -441,9 +441,9 @@ static void nand_davinci_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) { 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); - 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); else ioread8_rep(chip->IO_ADDR_R, buf, len); @@ -454,9 +454,9 @@ static void nand_davinci_write_buf(struct mtd_info *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); - 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); else iowrite8_rep(chip->IO_ADDR_R, buf, len); @@ -680,7 +680,7 @@ static int nand_davinci_probe(struct platform_device *pdev) info->chip.bbt_md = pdata->bbt_md; info->timing = pdata->timing; - info->ioaddr = (uint32_t __force) vaddr; + info->ioaddr = (uintptr_t __force) vaddr; info->current_cs = info->ioaddr; info->core_chipsel = pdata->core_chipsel;
Now that we can build this driver everywhere, we run into a couple of warnings like: drivers/mtd/nand/raw/davinci_nand.c: In function 'nand_davinci_correct_4bit': drivers/mtd/nand/raw/davinci_nand.c:322:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] In all cases, this is harmless and we just need to cast to an uintptr_t rather than an unsigned 32-bit integer. Fixes: 347af8918e8a ("mtd: rawnand: davinci: Allow selection of this driver when COMPILE_TEST=y") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/mtd/nand/raw/davinci_nand.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.9.0