Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / drivers / usb / musb / musbhsdma.c

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 8abfe4e..3620073 100644 (file)
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -117,7 +117,7 @@ static void configure_channel(struct dma_channel *channel,
        u8 bchannel = musb_channel->idx;
        u16 csr = 0;
 
-       dev_dbg(musb->controller, "%p, pkt_sz %d, addr %pad, len %d, mode %d\n",
+       musb_dbg(musb, "%p, pkt_sz %d, addr %pad, len %d, mode %d",
                        channel, packet_sz, &dma_addr, len, mode);
 
        if (mode) {
@@ -152,7 +152,7 @@ static int dma_channel_program(struct dma_channel *channel,
        struct musb_dma_controller *controller = musb_channel->controller;
        struct musb *musb = controller->private_data;
 
-       dev_dbg(musb->controller, "ep%d-%s pkt_sz %d, dma_addr %pad length %d, mode %d\n",
+       musb_dbg(musb, "ep%d-%s pkt_sz %d, dma_addr %pad length %d, mode %d",
                musb_channel->epnum,
                musb_channel->transmit ? "Tx" : "Rx",
                packet_sz, &dma_addr, len, mode);
@@ -266,7 +266,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
 #endif
 
        if (!int_hsdma) {
-               dev_dbg(musb->controller, "spurious DMA irq\n");
+               musb_dbg(musb, "spurious DMA irq");
 
                for (bchannel = 0; bchannel < MUSB_HSDMA_CHANNELS; bchannel++) {
                        musb_channel = (struct musb_dma_channel *)
@@ -280,7 +280,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
                        }
                }
 
-               dev_dbg(musb->controller, "int_hsdma = 0x%x\n", int_hsdma);
+               musb_dbg(musb, "int_hsdma = 0x%x", int_hsdma);
 
                if (!int_hsdma)
                        goto done;
@@ -307,7 +307,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
                                channel->actual_len = addr
                                        - musb_channel->start_addr;
 
-                               dev_dbg(musb->controller, "ch %p, 0x%x -> 0x%x (%zu / %d) %s\n",
+                               musb_dbg(musb, "ch %p, 0x%x -> 0x%x (%zu / %d) %s",
                                        channel, musb_channel->start_addr,
                                        addr, channel->actual_len,
                                        musb_channel->len,