From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Fri, 11 Apr 2008 10:59:16 +0000 (+0300)
Subject: USB: MUSB: sparse fixes to musb_hdrc driver
X-Git-Tag: v2.6.25-omap1~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=969f2361af4bebe56998c8c697be23bbaf274fb2;p=linux-2.6-omap-h63xx.git

USB: MUSB: sparse fixes to musb_hdrc driver

Get rid of some sparse warnings in musb_hdrc driver.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index f9e98d00e94..64673b71937 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1541,7 +1541,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 		if (dma) {
 			struct dma_controller	*c;
 			u16			rx_count;
-			int			status;
+			int			ret;
 
 			rx_count = musb_readw(epio, MUSB_RXCOUNT);
 
@@ -1600,7 +1600,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 			 * transfer_buffer_length needs to be
 			 * adjusted first...
 			 */
-			status = c->channel_program(
+			ret = c->channel_program(
 				dma, qh->maxpacket,
 				dma->desired_mode,
 				urb->transfer_dma
@@ -1609,7 +1609,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 					? rx_count
 					: urb->transfer_buffer_length);
 
-			if (!status) {
+			if (!ret) {
 				c->channel_release(dma);
 				dma = hw_ep->rx_channel = NULL;
 				/* REVISIT reset CSR */
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 75f084f0341..32bb1e2d874 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -172,7 +172,7 @@ static void configure_channel(struct dma_channel *pChannel,
 	struct musb_dma_channel *pImplChannel =
 		(struct musb_dma_channel *) pChannel->private_data;
 	struct musb_dma_controller *controller = pImplChannel->controller;
-	u8 *mbase = controller->pCoreBase;
+	void __iomem *mbase = controller->pCoreBase;
 	u8 bChannel = pImplChannel->bIndex;
 	u16 csr = 0;
 
@@ -250,7 +250,7 @@ static int dma_channel_abort(struct dma_channel *pChannel)
 	struct musb_dma_channel *pImplChannel =
 		(struct musb_dma_channel *) pChannel->private_data;
 	u8 bChannel = pImplChannel->bIndex;
-	u8 *mbase = pImplChannel->controller->pCoreBase;
+	void __iomem *mbase = pImplChannel->controller->pCoreBase;
 	u16 csr;
 
 	if (pChannel->status == MUSB_DMA_STATUS_BUSY) {
@@ -296,7 +296,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
 		(struct musb_dma_controller *)private_data;
 	struct musb_dma_channel *pImplChannel;
 	struct musb *musb = controller->pDmaPrivate;
-	u8 *mbase = controller->pCoreBase;
+	void __iomem *mbase = controller->pCoreBase;
 	struct dma_channel *pChannel;
 	u8 bChannel;
 	u16 csr;