Patchwork [U-Boot] pxa: fix compiler warnings about unused variables

login
register
mail settings
Submitter Mike Dunn
Date June 24, 2013, 7:47 p.m.
Message ID <1372103247-17852-1-git-send-email-mikedunn@newsguy.com>
Download mbox | patch
Permalink /patch/253951/
State Superseded
Delegated to: Marek Vasut
Headers show

Comments

Mike Dunn - June 24, 2013, 7:47 p.m.
Newer gcc versions warn about unused variables.  This patch corrects a few of
those warnings that popped up in a pxa build.

Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
---
 drivers/mtd/nand/docg4_spl.c    | 15 +++++++--------
 drivers/usb/gadget/pxa27x_udc.c | 14 +++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)
Marek Vasut - June 25, 2013, 6:43 p.m.
Dear Mike Dunn,

> Newer gcc versions warn about unused variables.  This patch corrects a few
> of those warnings that popped up in a pxa build.

Please split them, so the USB part can go through u-boot-usb and the MTD part 
through MTD or PXA tree.

Best regards,
Marek Vasut

Patch

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 & 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);
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 71cc0f2..598923d 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -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);