Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

[pandora-kernel.git] / drivers / usb / musb / cppi_dma.c

diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index ab434fb..149f3f3 100644 (file)
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -236,7 +236,7 @@ static int cppi_controller_stop(struct dma_controller *c)
        musb_writel(tibase, DAVINCI_RXCPPI_INTCLR_REG,
                        DAVINCI_DMA_ALL_CHANNELS_ENABLE);
 
-       DBG(1, "Tearing down RX and TX Channels\n");
+       dev_dbg(musb->controller, "Tearing down RX and TX Channels\n");
        for (i = 0; i < ARRAY_SIZE(controller->tx); i++) {
                /* FIXME restructure of txdma to use bds like rxdma */
                controller->tx[i].last_processed = NULL;
@@ -301,13 +301,13 @@ cppi_channel_allocate(struct dma_controller *c,
         */
        if (transmit) {
                if (index >= ARRAY_SIZE(controller->tx)) {
-                       DBG(1, "no %cX%d CPPI channel\n", 'T', index);
+                       dev_dbg(musb->controller, "no %cX%d CPPI channel\n", 'T', index);
                        return NULL;
                }
                cppi_ch = controller->tx + index;
        } else {
                if (index >= ARRAY_SIZE(controller->rx)) {
-                       DBG(1, "no %cX%d CPPI channel\n", 'R', index);
+                       dev_dbg(musb->controller, "no %cX%d CPPI channel\n", 'R', index);
                        return NULL;
                }
                cppi_ch = controller->rx + index;
@@ -318,13 +318,13 @@ cppi_channel_allocate(struct dma_controller *c,
         * with the other DMA engine too
         */
        if (cppi_ch->hw_ep)
-               DBG(1, "re-allocating DMA%d %cX channel %p\n",
+               dev_dbg(musb->controller, "re-allocating DMA%d %cX channel %p\n",
                                index, transmit ? 'T' : 'R', cppi_ch);
        cppi_ch->hw_ep = ep;
        cppi_ch->channel.status = MUSB_DMA_STATUS_FREE;
        cppi_ch->channel.max_len = 0x7fffffff;
 
-       DBG(4, "Allocate CPPI%d %cX\n", index, transmit ? 'T' : 'R');
+       dev_dbg(musb->controller, "Allocate CPPI%d %cX\n", index, transmit ? 'T' : 'R');
        return &cppi_ch->channel;
 }
 
@@ -339,7 +339,7 @@ static void cppi_channel_release(struct dma_channel *channel)
        c = container_of(channel, struct cppi_channel, channel);
        tibase = c->controller->tibase;
        if (!c->hw_ep)
-               DBG(1, "releasing idle DMA channel %p\n", c);
+               dev_dbg(musb->controller, "releasing idle DMA channel %p\n", c);
        else if (!c->transmit)
                core_rxirq_enable(tibase, c->index + 1);
 
@@ -597,7 +597,7 @@ cppi_next_tx_segment(struct musb *musb, struct cppi_channel *tx)
                length = min(n_bds * maxpacket, length);
        }
 
-       DBG(4, "TX DMA%d, pktSz %d %s bds %d dma 0x%llx len %u\n",
+       dev_dbg(musb->controller, "TX DMA%d, pktSz %d %s bds %d dma 0x%llx len %u\n",
                        tx->index,
                        maxpacket,
                        rndis ? "rndis" : "transparent",
@@ -654,7 +654,7 @@ cppi_next_tx_segment(struct musb *musb, struct cppi_channel *tx)
                                bd->hw_options |= CPPI_ZERO_SET;
                }
 
-               DBG(5, "TXBD %p: nxt %08x buf %08x len %04x opt %08x\n",
+               dev_dbg(musb->controller, "TXBD %p: nxt %08x buf %08x len %04x opt %08x\n",
                                bd, bd->hw_next, bd->hw_bufp,
                                bd->hw_off_len, bd->hw_options);
 
@@ -819,7 +819,7 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
 
        length = min(n_bds * maxpacket, length);
 
-       DBG(4, "RX DMA%d seg, maxp %d %s bds %d (cnt %d) "
+       dev_dbg(musb->controller, "RX DMA%d seg, maxp %d %s bds %d (cnt %d) "
                        "dma 0x%llx len %u %u/%u\n",
                        rx->index, maxpacket,
                        onepacket
@@ -936,7 +936,7 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
                        DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4))
                        & 0xffff;
        if (i < (2 + n_bds)) {
-               DBG(2, "bufcnt%d underrun - %d (for %d)\n",
+               dev_dbg(musb->controller, "bufcnt%d underrun - %d (for %d)\n",
                                        rx->index, i, n_bds);
                musb_writel(tibase,
                        DAVINCI_RXCPPI_BUFCNT0_REG + (rx->index * 4),
@@ -985,7 +985,7 @@ static int cppi_channel_program(struct dma_channel *ch,
                /* WARN_ON(1); */
                break;
        case MUSB_DMA_STATUS_UNKNOWN:
-               DBG(1, "%cX DMA%d not allocated!\n",
+               dev_dbg(musb->controller, "%cX DMA%d not allocated!\n",
                                cppi_ch->transmit ? 'T' : 'R',
                                cppi_ch->index);
                /* FALLTHROUGH */
@@ -1040,7 +1040,7 @@ static bool cppi_rx_scan(struct cppi *cppi, unsigned ch)
                if (!completed && (bd->hw_options & CPPI_OWN_SET))
                        break;
 
-               DBG(5, "C/RXBD %llx: nxt %08x buf %08x "
+               dev_dbg(musb->controller, "C/RXBD %llx: nxt %08x buf %08x "
                        "off.len %08x opt.len %08x (%d)\n",
                        (unsigned long long)bd->dma, bd->hw_next, bd->hw_bufp,
                        bd->hw_off_len, bd->hw_options,
@@ -1062,7 +1062,7 @@ static bool cppi_rx_scan(struct cppi *cppi, unsigned ch)
                         * CPPI ignores those BDs even though OWN is still set.
                         */
                        completed = true;
-                       DBG(3, "rx short %d/%d (%d)\n",
+                       dev_dbg(musb->controller, "rx short %d/%d (%d)\n",
                                        len, bd->buflen,
                                        rx->channel.actual_len);
                }
@@ -1112,7 +1112,7 @@ static bool cppi_rx_scan(struct cppi *cppi, unsigned ch)
                musb_ep_select(cppi->mregs, rx->index + 1);
                csr = musb_readw(regs, MUSB_RXCSR);
                if (csr & MUSB_RXCSR_DMAENAB) {
-                       DBG(4, "list%d %p/%p, last %llx%s, csr %04x\n",
+                       dev_dbg(musb->controller, "list%d %p/%p, last %llx%s, csr %04x\n",
                                rx->index,
                                rx->head, rx->tail,
                                rx->last_processed
@@ -1175,7 +1175,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
                return IRQ_NONE;
        }
 
-       DBG(4, "CPPI IRQ Tx%x Rx%x\n", tx, rx);
+       dev_dbg(musb->controller, "CPPI IRQ Tx%x Rx%x\n", tx, rx);
 
        /* process TX channels */
        for (index = 0; tx; tx = tx >> 1, index++) {
@@ -1203,7 +1203,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
                 * that needs to be acknowledged.
                 */
                if (NULL == bd) {
-                       DBG(1, "null BD\n");
+                       dev_dbg(musb->controller, "null BD\n");
                        musb_writel(&tx_ram->tx_complete, 0, 0);
                        continue;
                }
@@ -1218,7 +1218,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
                        if (bd->hw_options & CPPI_OWN_SET)
                                break;
 
-                       DBG(5, "C/TXBD %p n %x b %x off %x opt %x\n",
+                       dev_dbg(musb->controller, "C/TXBD %p n %x b %x off %x opt %x\n",
                                        bd, bd->hw_next, bd->hw_bufp,
                                        bd->hw_off_len, bd->hw_options);