Commit 969f2361 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

USB: MUSB: sparse fixes to musb_hdrc driver

Get rid of some sparse warnings in musb_hdrc driver.
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c1ddce98
...@@ -1541,7 +1541,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) ...@@ -1541,7 +1541,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
if (dma) { if (dma) {
struct dma_controller *c; struct dma_controller *c;
u16 rx_count; u16 rx_count;
int status; int ret;
rx_count = musb_readw(epio, MUSB_RXCOUNT); rx_count = musb_readw(epio, MUSB_RXCOUNT);
...@@ -1600,7 +1600,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) ...@@ -1600,7 +1600,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
* transfer_buffer_length needs to be * transfer_buffer_length needs to be
* adjusted first... * adjusted first...
*/ */
status = c->channel_program( ret = c->channel_program(
dma, qh->maxpacket, dma, qh->maxpacket,
dma->desired_mode, dma->desired_mode,
urb->transfer_dma urb->transfer_dma
...@@ -1609,7 +1609,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) ...@@ -1609,7 +1609,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
? rx_count ? rx_count
: urb->transfer_buffer_length); : urb->transfer_buffer_length);
if (!status) { if (!ret) {
c->channel_release(dma); c->channel_release(dma);
dma = hw_ep->rx_channel = NULL; dma = hw_ep->rx_channel = NULL;
/* REVISIT reset CSR */ /* REVISIT reset CSR */
......
...@@ -172,7 +172,7 @@ static void configure_channel(struct dma_channel *pChannel, ...@@ -172,7 +172,7 @@ static void configure_channel(struct dma_channel *pChannel,
struct musb_dma_channel *pImplChannel = struct musb_dma_channel *pImplChannel =
(struct musb_dma_channel *) pChannel->private_data; (struct musb_dma_channel *) pChannel->private_data;
struct musb_dma_controller *controller = pImplChannel->controller; struct musb_dma_controller *controller = pImplChannel->controller;
u8 *mbase = controller->pCoreBase; void __iomem *mbase = controller->pCoreBase;
u8 bChannel = pImplChannel->bIndex; u8 bChannel = pImplChannel->bIndex;
u16 csr = 0; u16 csr = 0;
...@@ -250,7 +250,7 @@ static int dma_channel_abort(struct dma_channel *pChannel) ...@@ -250,7 +250,7 @@ static int dma_channel_abort(struct dma_channel *pChannel)
struct musb_dma_channel *pImplChannel = struct musb_dma_channel *pImplChannel =
(struct musb_dma_channel *) pChannel->private_data; (struct musb_dma_channel *) pChannel->private_data;
u8 bChannel = pImplChannel->bIndex; u8 bChannel = pImplChannel->bIndex;
u8 *mbase = pImplChannel->controller->pCoreBase; void __iomem *mbase = pImplChannel->controller->pCoreBase;
u16 csr; u16 csr;
if (pChannel->status == MUSB_DMA_STATUS_BUSY) { if (pChannel->status == MUSB_DMA_STATUS_BUSY) {
...@@ -296,7 +296,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) ...@@ -296,7 +296,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
(struct musb_dma_controller *)private_data; (struct musb_dma_controller *)private_data;
struct musb_dma_channel *pImplChannel; struct musb_dma_channel *pImplChannel;
struct musb *musb = controller->pDmaPrivate; struct musb *musb = controller->pDmaPrivate;
u8 *mbase = controller->pCoreBase; void __iomem *mbase = controller->pCoreBase;
struct dma_channel *pChannel; struct dma_channel *pChannel;
u8 bChannel; u8 bChannel;
u16 csr; u16 csr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment