diff options
Diffstat (limited to 'drivers/usb/musb/musbhsdma.c')
-rw-r--r-- | drivers/usb/musb/musbhsdma.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index d281792db05c..f70c5a577736 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c | |||
@@ -122,11 +122,12 @@ static void configure_channel(struct dma_channel *channel, | |||
122 | { | 122 | { |
123 | struct musb_dma_channel *musb_channel = channel->private_data; | 123 | struct musb_dma_channel *musb_channel = channel->private_data; |
124 | struct musb_dma_controller *controller = musb_channel->controller; | 124 | struct musb_dma_controller *controller = musb_channel->controller; |
125 | struct musb *musb = controller->private_data; | ||
125 | void __iomem *mbase = controller->base; | 126 | void __iomem *mbase = controller->base; |
126 | u8 bchannel = musb_channel->idx; | 127 | u8 bchannel = musb_channel->idx; |
127 | u16 csr = 0; | 128 | u16 csr = 0; |
128 | 129 | ||
129 | DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n", | 130 | dev_dbg(musb->controller, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n", |
130 | channel, packet_sz, dma_addr, len, mode); | 131 | channel, packet_sz, dma_addr, len, mode); |
131 | 132 | ||
132 | if (mode) { | 133 | if (mode) { |
@@ -161,7 +162,7 @@ static int dma_channel_program(struct dma_channel *channel, | |||
161 | struct musb_dma_controller *controller = musb_channel->controller; | 162 | struct musb_dma_controller *controller = musb_channel->controller; |
162 | struct musb *musb = controller->private_data; | 163 | struct musb *musb = controller->private_data; |
163 | 164 | ||
164 | DBG(2, "ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n", | 165 | dev_dbg(musb->controller, "ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n", |
165 | musb_channel->epnum, | 166 | musb_channel->epnum, |
166 | musb_channel->transmit ? "Tx" : "Rx", | 167 | musb_channel->transmit ? "Tx" : "Rx", |
167 | packet_sz, dma_addr, len, mode); | 168 | packet_sz, dma_addr, len, mode); |
@@ -274,7 +275,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) | |||
274 | #endif | 275 | #endif |
275 | 276 | ||
276 | if (!int_hsdma) { | 277 | if (!int_hsdma) { |
277 | DBG(2, "spurious DMA irq\n"); | 278 | dev_dbg(musb->controller, "spurious DMA irq\n"); |
278 | 279 | ||
279 | for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) { | 280 | for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) { |
280 | musb_channel = (struct musb_dma_channel *) | 281 | musb_channel = (struct musb_dma_channel *) |
@@ -288,7 +289,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) | |||
288 | } | 289 | } |
289 | } | 290 | } |
290 | 291 | ||
291 | DBG(2, "int_hsdma = 0x%x\n", int_hsdma); | 292 | dev_dbg(musb->controller, "int_hsdma = 0x%x\n", int_hsdma); |
292 | 293 | ||
293 | if (!int_hsdma) | 294 | if (!int_hsdma) |
294 | goto done; | 295 | goto done; |
@@ -315,7 +316,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) | |||
315 | channel->actual_len = addr | 316 | channel->actual_len = addr |
316 | - musb_channel->start_addr; | 317 | - musb_channel->start_addr; |
317 | 318 | ||
318 | DBG(2, "ch %p, 0x%x -> 0x%x (%zu / %d) %s\n", | 319 | dev_dbg(musb->controller, "ch %p, 0x%x -> 0x%x (%zu / %d) %s\n", |
319 | channel, musb_channel->start_addr, | 320 | channel, musb_channel->start_addr, |
320 | addr, channel->actual_len, | 321 | addr, channel->actual_len, |
321 | musb_channel->len, | 322 | musb_channel->len, |