[U-Boot] [PATCH] mtd/nand: docg4: fix compiler warnings
Newer gcc versions warn about unused variables. This patch corrects a few of those warnings that popped up in a build for the palmtreo680 board. Signed-off-by: Mike Dunn --- drivers/mtd/nand/docg4_spl.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/nand/docg4_spl.c b/drivers/mtd/nand/docg4_spl.c index 95e856c..734cbeb 100644 --- a/drivers/mtd/nand/docg4_spl.c +++ b/drivers/mtd/nand/docg4_spl.c @@ -113,7 +113,6 @@ static int docg4_load_block_reliable(uint32_t flash_offset, void *dest_addr) int g4_index = 0; uint16_t flash_status; uint16_t *buf; - uint16_t discard, magic_high, magic_low; /* flash_offset must be aligned to the start of a block */ if (flash_offset & 0x3) @@ -154,9 +153,9 @@ static int docg4_load_block_reliable(uint32_t flash_offset, void *dest_addr) * The IPL on the palmtreo680 requires that this contain a 32 bit magic * number, or the load aborts. We'll ignore it. */ - discard = readw(docptr + 0x103c); /* hw quirk; 1st read discarded */ - magic_low = readw(docptr + 0x103c); - magic_high = readw(docptr + DOCG4_MYSTERY_REG); + readw(docptr + 0x103c); /* hw quirk; 1st read discarded */ + readw(docptr + 0x103c); /* lower 16 bits of magic number */ + readw(docptr + DOCG4_MYSTERY_REG); /* upper 16 bits of magic number */ writew(0, docptr + DOC_DATAEND); write_nop(docptr); write_nop(docptr); @@ -183,15 +182,15 @@ static int docg4_load_block_reliable(uint32_t flash_offset, void *dest_addr) write_nop(docptr); /* read the 512 bytes of page data, 2 bytes at a time */ - discard = readw(docptr + 0x103c); + readw(docptr + 0x103c); /* hw quirk */ for (i = 0; i < 256; i++) *buf++ = readw(docptr + 0x103c); /* read oob, but discard it */ for (i = 0; i < 7; i++) - discard = readw(docptr + 0x103c); - discard = readw(docptr + DOCG4_OOB_6_7); - discard = readw(docptr + DOCG4_OOB_6_7); + readw(docptr + 0x103c); + readw(docptr + DOCG4_OOB_6_7); + readw(docptr + DOCG4_OOB_6_7); writew(0, docptr + DOC_DATAEND); write_nop(docptr); -- 1.8.1.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mtd/nand: docg4: fix compiler warnings
On 06/26/2013 02:33:53 PM, Mike Dunn wrote: Newer gcc versions warn about unused variables. This patch corrects a few of those warnings that popped up in a build for the palmtreo680 board. Signed-off-by: Mike Dunn --- drivers/mtd/nand/docg4_spl.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) Applied to u-boot-nand-flash -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mtd/nand: docg4: fix compiler warnings
Dear Scott Wood, > On 06/26/2013 02:33:53 PM, Mike Dunn wrote: > > Newer gcc versions warn about unused variables. This patch corrects > > a few of > > those warnings that popped up in a build for the palmtreo680 board. > > > > Signed-off-by: Mike Dunn > > --- > > > > drivers/mtd/nand/docg4_spl.c | 15 +++ > > 1 file changed, 7 insertions(+), 8 deletions(-) > > Applied to u-boot-nand-flash > > -Scott Ok, now I need Albert to pick the PXA PR and you will have to push NAND PR after the ARM PR is mainline. It's a bit complicated now. The other way around would be that I pick both. Albert? Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mtd/nand: docg4: fix compiler warnings
On 06/26/2013 05:42:52 PM, Marek Vasut wrote: Dear Scott Wood, > On 06/26/2013 02:33:53 PM, Mike Dunn wrote: > > Newer gcc versions warn about unused variables. This patch corrects > > a few of > > those warnings that popped up in a build for the palmtreo680 board. > > > > Signed-off-by: Mike Dunn > > --- > > > > drivers/mtd/nand/docg4_spl.c | 15 +++ > > 1 file changed, 7 insertions(+), 8 deletions(-) > > Applied to u-boot-nand-flash > > -Scott Ok, now I need Albert to pick the PXA PR and you will have to push NAND PR after the ARM PR is mainline. It's a bit complicated now. The other way around would be that I pick both. Albert? Why would NAND need to wait until after ARM to request a pull? If anything I'd think you'd want it the other way around so that the warnings are fixed by the time the board is merged. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mtd/nand: docg4: fix compiler warnings
Dear Scott Wood, > On 06/26/2013 05:42:52 PM, Marek Vasut wrote: > > Dear Scott Wood, > > > > > On 06/26/2013 02:33:53 PM, Mike Dunn wrote: > > > > Newer gcc versions warn about unused variables. This patch > > > > corrects > > > > > > a few of > > > > those warnings that popped up in a build for the palmtreo680 > > > > board. > > > > > > Signed-off-by: Mike Dunn > > > > --- > > > > > > > > drivers/mtd/nand/docg4_spl.c | 15 +++ > > > > 1 file changed, 7 insertions(+), 8 deletions(-) > > > > > > Applied to u-boot-nand-flash > > > > > > -Scott > > > > Ok, now I need Albert to pick the PXA PR and you will have to push > > NAND PR after > > the ARM PR is mainline. It's a bit complicated now. > > > > The other way around would be that I pick both. > > > > Albert? > > Why would NAND need to wait until after ARM to request a pull? If > anything I'd think you'd want it the other way around so that the > warnings are fixed by the time the board is merged. Ok, the DoCG4 driver is already in, then it's all cool. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
