diff options
author | Felipe Balbi <balbi@ti.com> | 2011-05-11 05:44:08 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-05-13 07:34:04 -0400 |
commit | 5c8a86e10a7c164f44537fabdc169fd8b4e7a440 (patch) | |
tree | 96fe3eb08b9ae01f62e45b725049d3f2aa6b7bba /drivers/usb/musb/tusb6010_omap.c | |
parent | a0885924326f79e157847010a9aaf49b058b30dc (diff) |
usb: musb: drop unneeded musb_debug trickery
We have a generic way of enabling/disabling
different debug messages on a driver called
DYNAMIC_PRINTK. Anyone interested in enabling
just part of the debug messages, please read
the documentation under:
Documentation/dynamic-debug-howto.txt
for information on how to use that great
infrastructure.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/tusb6010_omap.c')
-rw-r--r-- | drivers/usb/musb/tusb6010_omap.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 99cb541e4ef0..c784e6c03aac 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c | |||
@@ -65,7 +65,7 @@ static int tusb_omap_dma_start(struct dma_controller *c) | |||
65 | 65 | ||
66 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); | 66 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); |
67 | 67 | ||
68 | /* DBG(3, "ep%i ch: %i\n", chdat->epnum, chdat->ch); */ | 68 | /* dev_dbg(musb->controller, "ep%i ch: %i\n", chdat->epnum, chdat->ch); */ |
69 | 69 | ||
70 | return 0; | 70 | return 0; |
71 | } | 71 | } |
@@ -76,7 +76,7 @@ static int tusb_omap_dma_stop(struct dma_controller *c) | |||
76 | 76 | ||
77 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); | 77 | tusb_dma = container_of(c, struct tusb_omap_dma, controller); |
78 | 78 | ||
79 | /* DBG(3, "ep%i ch: %i\n", chdat->epnum, chdat->ch); */ | 79 | /* dev_dbg(musb->controller, "ep%i ch: %i\n", chdat->epnum, chdat->ch); */ |
80 | 80 | ||
81 | return 0; | 81 | return 0; |
82 | } | 82 | } |
@@ -89,7 +89,7 @@ static inline int tusb_omap_use_shared_dmareq(struct tusb_omap_dma_ch *chdat) | |||
89 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); | 89 | u32 reg = musb_readl(chdat->tbase, TUSB_DMA_EP_MAP); |
90 | 90 | ||
91 | if (reg != 0) { | 91 | if (reg != 0) { |
92 | DBG(3, "ep%i dmareq0 is busy for ep%i\n", | 92 | dev_dbg(musb->controller, "ep%i dmareq0 is busy for ep%i\n", |
93 | chdat->epnum, reg & 0xf); | 93 | chdat->epnum, reg & 0xf); |
94 | return -EAGAIN; | 94 | return -EAGAIN; |
95 | } | 95 | } |
@@ -143,7 +143,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
143 | if (ch_status != OMAP_DMA_BLOCK_IRQ) | 143 | if (ch_status != OMAP_DMA_BLOCK_IRQ) |
144 | printk(KERN_ERR "TUSB DMA error status: %i\n", ch_status); | 144 | printk(KERN_ERR "TUSB DMA error status: %i\n", ch_status); |
145 | 145 | ||
146 | DBG(3, "ep%i %s dma callback ch: %i status: %x\n", | 146 | dev_dbg(musb->controller, "ep%i %s dma callback ch: %i status: %x\n", |
147 | chdat->epnum, chdat->tx ? "tx" : "rx", | 147 | chdat->epnum, chdat->tx ? "tx" : "rx", |
148 | ch, ch_status); | 148 | ch, ch_status); |
149 | 149 | ||
@@ -156,7 +156,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
156 | 156 | ||
157 | /* HW issue #10: XFR_SIZE may get corrupt on DMA (both async & sync) */ | 157 | /* HW issue #10: XFR_SIZE may get corrupt on DMA (both async & sync) */ |
158 | if (unlikely(remaining > chdat->transfer_len)) { | 158 | if (unlikely(remaining > chdat->transfer_len)) { |
159 | DBG(2, "Corrupt %s dma ch%i XFR_SIZE: 0x%08lx\n", | 159 | dev_dbg(musb->controller, "Corrupt %s dma ch%i XFR_SIZE: 0x%08lx\n", |
160 | chdat->tx ? "tx" : "rx", chdat->ch, | 160 | chdat->tx ? "tx" : "rx", chdat->ch, |
161 | remaining); | 161 | remaining); |
162 | remaining = 0; | 162 | remaining = 0; |
@@ -165,13 +165,13 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
165 | channel->actual_len = chdat->transfer_len - remaining; | 165 | channel->actual_len = chdat->transfer_len - remaining; |
166 | pio = chdat->len - channel->actual_len; | 166 | pio = chdat->len - channel->actual_len; |
167 | 167 | ||
168 | DBG(3, "DMA remaining %lu/%u\n", remaining, chdat->transfer_len); | 168 | dev_dbg(musb->controller, "DMA remaining %lu/%u\n", remaining, chdat->transfer_len); |
169 | 169 | ||
170 | /* Transfer remaining 1 - 31 bytes */ | 170 | /* Transfer remaining 1 - 31 bytes */ |
171 | if (pio > 0 && pio < 32) { | 171 | if (pio > 0 && pio < 32) { |
172 | u8 *buf; | 172 | u8 *buf; |
173 | 173 | ||
174 | DBG(3, "Using PIO for remaining %lu bytes\n", pio); | 174 | dev_dbg(musb->controller, "Using PIO for remaining %lu bytes\n", pio); |
175 | buf = phys_to_virt((u32)chdat->dma_addr) + chdat->transfer_len; | 175 | buf = phys_to_virt((u32)chdat->dma_addr) + chdat->transfer_len; |
176 | if (chdat->tx) { | 176 | if (chdat->tx) { |
177 | dma_unmap_single(dev, chdat->dma_addr, | 177 | dma_unmap_single(dev, chdat->dma_addr, |
@@ -209,7 +209,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
209 | u16 csr; | 209 | u16 csr; |
210 | 210 | ||
211 | if (chdat->tx) { | 211 | if (chdat->tx) { |
212 | DBG(3, "terminating short tx packet\n"); | 212 | dev_dbg(musb->controller, "terminating short tx packet\n"); |
213 | musb_ep_select(mbase, chdat->epnum); | 213 | musb_ep_select(mbase, chdat->epnum); |
214 | csr = musb_readw(hw_ep->regs, MUSB_TXCSR); | 214 | csr = musb_readw(hw_ep->regs, MUSB_TXCSR); |
215 | csr |= MUSB_TXCSR_MODE | MUSB_TXCSR_TXPKTRDY | 215 | csr |= MUSB_TXCSR_MODE | MUSB_TXCSR_TXPKTRDY |
@@ -264,7 +264,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | |||
264 | 264 | ||
265 | dma_remaining = TUSB_EP_CONFIG_XFR_SIZE(dma_remaining); | 265 | dma_remaining = TUSB_EP_CONFIG_XFR_SIZE(dma_remaining); |
266 | if (dma_remaining) { | 266 | if (dma_remaining) { |
267 | DBG(2, "Busy %s dma ch%i, not using: %08x\n", | 267 | dev_dbg(musb->controller, "Busy %s dma ch%i, not using: %08x\n", |
268 | chdat->tx ? "tx" : "rx", chdat->ch, | 268 | chdat->tx ? "tx" : "rx", chdat->ch, |
269 | dma_remaining); | 269 | dma_remaining); |
270 | return false; | 270 | return false; |
@@ -283,7 +283,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | |||
283 | sync_dev = chdat->sync_dev; | 283 | sync_dev = chdat->sync_dev; |
284 | } else { | 284 | } else { |
285 | if (tusb_omap_use_shared_dmareq(chdat) != 0) { | 285 | if (tusb_omap_use_shared_dmareq(chdat) != 0) { |
286 | DBG(3, "could not get dma for ep%i\n", chdat->epnum); | 286 | dev_dbg(musb->controller, "could not get dma for ep%i\n", chdat->epnum); |
287 | return false; | 287 | return false; |
288 | } | 288 | } |
289 | if (tusb_dma->ch < 0) { | 289 | if (tusb_dma->ch < 0) { |
@@ -326,7 +326,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | |||
326 | 326 | ||
327 | dma_params.frame_count = chdat->transfer_len / 32; /* Burst sz frame */ | 327 | dma_params.frame_count = chdat->transfer_len / 32; /* Burst sz frame */ |
328 | 328 | ||
329 | DBG(3, "ep%i %s dma ch%i dma: %08x len: %u(%u) packet_sz: %i(%i)\n", | 329 | dev_dbg(musb->controller, "ep%i %s dma ch%i dma: %08x len: %u(%u) packet_sz: %i(%i)\n", |
330 | chdat->epnum, chdat->tx ? "tx" : "rx", | 330 | chdat->epnum, chdat->tx ? "tx" : "rx", |
331 | ch, dma_addr, chdat->transfer_len, len, | 331 | ch, dma_addr, chdat->transfer_len, len, |
332 | chdat->transfer_packet_sz, packet_sz); | 332 | chdat->transfer_packet_sz, packet_sz); |
@@ -370,7 +370,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | |||
370 | dst_burst = OMAP_DMA_DATA_BURST_16; /* 16x32 write */ | 370 | dst_burst = OMAP_DMA_DATA_BURST_16; /* 16x32 write */ |
371 | } | 371 | } |
372 | 372 | ||
373 | DBG(3, "ep%i %s using %i-bit %s dma from 0x%08lx to 0x%08lx\n", | 373 | dev_dbg(musb->controller, "ep%i %s using %i-bit %s dma from 0x%08lx to 0x%08lx\n", |
374 | chdat->epnum, chdat->tx ? "tx" : "rx", | 374 | chdat->epnum, chdat->tx ? "tx" : "rx", |
375 | (dma_params.data_type == OMAP_DMA_DATA_TYPE_S32) ? 32 : 16, | 375 | (dma_params.data_type == OMAP_DMA_DATA_TYPE_S32) ? 32 : 16, |
376 | ((dma_addr & 0x3) == 0) ? "sync" : "async", | 376 | ((dma_addr & 0x3) == 0) ? "sync" : "async", |
@@ -525,7 +525,7 @@ tusb_omap_dma_allocate(struct dma_controller *c, | |||
525 | 525 | ||
526 | /* REVISIT: Why does dmareq5 not work? */ | 526 | /* REVISIT: Why does dmareq5 not work? */ |
527 | if (hw_ep->epnum == 0) { | 527 | if (hw_ep->epnum == 0) { |
528 | DBG(3, "Not allowing DMA for ep0 %s\n", tx ? "tx" : "rx"); | 528 | dev_dbg(musb->controller, "Not allowing DMA for ep0 %s\n", tx ? "tx" : "rx"); |
529 | return NULL; | 529 | return NULL; |
530 | } | 530 | } |
531 | 531 | ||
@@ -585,7 +585,7 @@ tusb_omap_dma_allocate(struct dma_controller *c, | |||
585 | chdat->ch = -1; | 585 | chdat->ch = -1; |
586 | } | 586 | } |
587 | 587 | ||
588 | DBG(3, "ep%i %s dma: %s dma%i dmareq%i sync%i\n", | 588 | dev_dbg(musb->controller, "ep%i %s dma: %s dma%i dmareq%i sync%i\n", |
589 | chdat->epnum, | 589 | chdat->epnum, |
590 | chdat->tx ? "tx" : "rx", | 590 | chdat->tx ? "tx" : "rx", |
591 | chdat->ch >= 0 ? "dedicated" : "shared", | 591 | chdat->ch >= 0 ? "dedicated" : "shared", |
@@ -598,7 +598,7 @@ tusb_omap_dma_allocate(struct dma_controller *c, | |||
598 | free_dmareq: | 598 | free_dmareq: |
599 | tusb_omap_dma_free_dmareq(chdat); | 599 | tusb_omap_dma_free_dmareq(chdat); |
600 | 600 | ||
601 | DBG(3, "ep%i: Could not get a DMA channel\n", chdat->epnum); | 601 | dev_dbg(musb->controller, "ep%i: Could not get a DMA channel\n", chdat->epnum); |
602 | channel->status = MUSB_DMA_STATUS_UNKNOWN; | 602 | channel->status = MUSB_DMA_STATUS_UNKNOWN; |
603 | 603 | ||
604 | return NULL; | 604 | return NULL; |
@@ -611,7 +611,7 @@ static void tusb_omap_dma_release(struct dma_channel *channel) | |||
611 | void __iomem *tbase = musb->ctrl_base; | 611 | void __iomem *tbase = musb->ctrl_base; |
612 | u32 reg; | 612 | u32 reg; |
613 | 613 | ||
614 | DBG(3, "ep%i ch%i\n", chdat->epnum, chdat->ch); | 614 | dev_dbg(musb->controller, "ep%i ch%i\n", chdat->epnum, chdat->ch); |
615 | 615 | ||
616 | reg = musb_readl(tbase, TUSB_DMA_INT_MASK); | 616 | reg = musb_readl(tbase, TUSB_DMA_INT_MASK); |
617 | if (chdat->tx) | 617 | if (chdat->tx) |