Skip to contentSkip to conversation

mtd/nand: docg4: fix compiler warnings

PATCH New Mike Dunn 3 participants 6 messages Jun 26, 2013

Subsystems (3)
USB Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Mike Dunn

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

 drivers/mtd/nand/docg4_spl.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/mtd/nand/docg4_spl.c +7 -8
index 95e856c..734cbeb 100644
@@ -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 & 0x3ffff)

@@ -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);
Signature · 1 line
1.8.1.5
author
#1 lore raw

PATCH 1/1 usb: pxa27x_udc: 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 <[email protected]>
---
 drivers/usb/gadget/pxa27x_udc.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/usb/gadget/pxa27x_udc.c +5 -9
index 71cc0f2..598923d 100644
@@ -151,7 +151,7 @@ static int udc_read_urb(struct usb_endpoint_instance *endpoint)
 	struct urb *urb = endpoint->rcv_urb;
 	int ep_num = endpoint->endpoint_address & USB_ENDPOINT_NUMBER_MASK;
 	u32 *data32 = (u32 *) urb->buffer;
-	unsigned int i, n, is_short ;
+	unsigned int i, n;
 
 	usbdbg("read urb on ep %d", ep_num);
 #if defined(USBDDBG) && defined(USBDPARANOIA)

@@ -165,9 +165,8 @@ static int udc_read_urb(struct usb_endpoint_instance *endpoint)
 		n = readl(UDCBCN(ep_num)) & 0x3ff;
 	else /* zlp */
 		n = 0;
-	is_short = n != endpoint->rcv_packetSize;
 
-	usbdbg("n %d%s", n, is_short ? "-s" : "");
+	usbdbg("n %d%s", n, n != endpoint->rcv_packetSize ? "-s" : "");
 	for (i = 0; i < n; i += 4)
 		data32[urb->actual_length / 4 + i / 4] = readl(UDCDN(ep_num));
 

@@ -402,16 +401,13 @@ static void udc_handle_ep(struct usb_endpoint_instance *endpoint)
 
 static void udc_state_changed(void)
 {
-	int config, interface, alternate;
 
 	writel(readl(UDCCR) | UDCCR_SMAC, UDCCR);
 
-	config = (readl(UDCCR) & UDCCR_ACN) >> UDCCR_ACN_S;
-	interface = (readl(UDCCR) & UDCCR_AIN) >> UDCCR_AIN_S;
-	alternate = (readl(UDCCR) & UDCCR_AAISN) >> UDCCR_AAISN_S;
-
 	usbdbg("New UDC settings are: conf %d - inter %d - alter %d",
-		config, interface, alternate);
+	       (readl(UDCCR) & UDCCR_ACN) >> UDCCR_ACN_S,
+	       (readl(UDCCR) & UDCCR_AIN) >> UDCCR_AIN_S,
+	       (readl(UDCCR) & UDCCR_AAISN) >> UDCCR_AAISN_S);
 
 	usbd_device_event_irq(udc_device, DEVICE_CONFIGURED, 0);
 	writel(UDCISR1_IRCC, UDCISR1);
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 1/1 mtd/nand: docg4: fix compiler warnings

In reply to Mike Dunn
Quoted 9 lines · Mike Dunn

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 <[email protected]>

---

 drivers/mtd/nand/docg4_spl.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Applied to u-boot-nand-flash

-Scott

#3 lore raw

PATCH 1/1 mtd/nand: docg4: fix compiler warnings

Dear Scott Wood,

Quoted 8 lines · Mike Dunn
Quoted 7 lines

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 <[email protected]>

---

Quoted 6 lines
Quoted 2 lines
 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

#4 lore raw

PATCH 1/1 mtd/nand: docg4: fix compiler warnings

Quoted 19 lines · Marek Vasut

Dear Scott Wood,

Quoted 2 lines · Mike Dunn
Quoted 1 line

Newer gcc versions warn about unused variables. This patch

corrects

Quoted 2 lines
Quoted 2 lines

a few of
those warnings that popped up in a build for the palmtreo680

board.

Quoted 10 lines
Quoted 6 lines
Signed-off-by Mike Dunn <[email protected]>

---

 drivers/mtd/nand/docg4_spl.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Applied to u-boot-nand-flash

-Scott

Quoted 7 lines

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

#5 lore raw

PATCH 1/1 mtd/nand: docg4: fix compiler warnings

Dear Scott Wood,

Quoted 27 lines · Marek Vasut
Quoted 26 lines

Dear Scott Wood,

Quoted 2 lines · Mike Dunn
Quoted 1 line

Newer gcc versions warn about unused variables. This patch

corrects

Quoted 2 lines
Quoted 2 lines

a few of
those warnings that popped up in a build for the palmtreo680

board.

Quoted 9 lines
Quoted 5 lines
Signed-off-by Mike Dunn <[email protected]>

---

 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.

Quoted 7 lines
Quoted 3 lines

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