diff options
author | Per Forlin <per.forlin@linaro.org> | 2011-08-03 08:22:17 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-08-12 04:52:46 -0400 |
commit | afbd0749c0507d5fea980b3bfa76efc43af83d60 (patch) | |
tree | 9c2a61e0a99f03a208d78face2c18b20414d3078 /drivers/usb | |
parent | d366d39bab562545ccb4a5931d62d0fd9e6a8ffc (diff) |
usb: musb: ux500: replace missing DBG with dev_dbg
ux500_dma.c fail to compile becase DBG has been removed from musb_debug.
Use dev_dbg for all prints.
Cc: stable@vger.kernel.org
Signed-off-by: Per Forlin <per.forlin@linaro.org>
Acked-by: Mian Yousaf Kaukab<mian.yousaf.kaukab@stericsson.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/musb/ux500_dma.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index 23134754b7c0..ef4333f4bbe0 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c | |||
@@ -65,7 +65,8 @@ static void ux500_tx_work(struct work_struct *data) | |||
65 | struct musb *musb = hw_ep->musb; | 65 | struct musb *musb = hw_ep->musb; |
66 | unsigned long flags; | 66 | unsigned long flags; |
67 | 67 | ||
68 | DBG(4, "DMA tx transfer done on hw_ep=%d\n", hw_ep->epnum); | 68 | dev_dbg(musb->controller, "DMA tx transfer done on hw_ep=%d\n", |
69 | hw_ep->epnum); | ||
69 | 70 | ||
70 | spin_lock_irqsave(&musb->lock, flags); | 71 | spin_lock_irqsave(&musb->lock, flags); |
71 | ux500_channel->channel.actual_len = ux500_channel->cur_len; | 72 | ux500_channel->channel.actual_len = ux500_channel->cur_len; |
@@ -84,7 +85,8 @@ static void ux500_rx_work(struct work_struct *data) | |||
84 | struct musb *musb = hw_ep->musb; | 85 | struct musb *musb = hw_ep->musb; |
85 | unsigned long flags; | 86 | unsigned long flags; |
86 | 87 | ||
87 | DBG(4, "DMA rx transfer done on hw_ep=%d\n", hw_ep->epnum); | 88 | dev_dbg(musb->controller, "DMA rx transfer done on hw_ep=%d\n", |
89 | hw_ep->epnum); | ||
88 | 90 | ||
89 | spin_lock_irqsave(&musb->lock, flags); | 91 | spin_lock_irqsave(&musb->lock, flags); |
90 | ux500_channel->channel.actual_len = ux500_channel->cur_len; | 92 | ux500_channel->channel.actual_len = ux500_channel->cur_len; |
@@ -116,9 +118,11 @@ static bool ux500_configure_channel(struct dma_channel *channel, | |||
116 | enum dma_slave_buswidth addr_width; | 118 | enum dma_slave_buswidth addr_width; |
117 | dma_addr_t usb_fifo_addr = (MUSB_FIFO_OFFSET(hw_ep->epnum) + | 119 | dma_addr_t usb_fifo_addr = (MUSB_FIFO_OFFSET(hw_ep->epnum) + |
118 | ux500_channel->controller->phy_base); | 120 | ux500_channel->controller->phy_base); |
121 | struct musb *musb = ux500_channel->controller->private_data; | ||
119 | 122 | ||
120 | DBG(4, "packet_sz=%d, mode=%d, dma_addr=0x%x, len=%d is_tx=%d\n", | 123 | dev_dbg(musb->controller, |
121 | packet_sz, mode, dma_addr, len, ux500_channel->is_tx); | 124 | "packet_sz=%d, mode=%d, dma_addr=0x%x, len=%d is_tx=%d\n", |
125 | packet_sz, mode, dma_addr, len, ux500_channel->is_tx); | ||
122 | 126 | ||
123 | ux500_channel->cur_len = len; | 127 | ux500_channel->cur_len = len; |
124 | 128 | ||
@@ -164,6 +168,7 @@ static struct dma_channel *ux500_dma_channel_allocate(struct dma_controller *c, | |||
164 | struct ux500_dma_controller *controller = container_of(c, | 168 | struct ux500_dma_controller *controller = container_of(c, |
165 | struct ux500_dma_controller, controller); | 169 | struct ux500_dma_controller, controller); |
166 | struct ux500_dma_channel *ux500_channel = NULL; | 170 | struct ux500_dma_channel *ux500_channel = NULL; |
171 | struct musb *musb = controller->private_data; | ||
167 | u8 ch_num = hw_ep->epnum - 1; | 172 | u8 ch_num = hw_ep->epnum - 1; |
168 | u32 max_ch; | 173 | u32 max_ch; |
169 | 174 | ||
@@ -190,7 +195,7 @@ static struct dma_channel *ux500_dma_channel_allocate(struct dma_controller *c, | |||
190 | ux500_channel->hw_ep = hw_ep; | 195 | ux500_channel->hw_ep = hw_ep; |
191 | ux500_channel->is_allocated = 1; | 196 | ux500_channel->is_allocated = 1; |
192 | 197 | ||
193 | DBG(7, "hw_ep=%d, is_tx=0x%x, channel=%d\n", | 198 | dev_dbg(musb->controller, "hw_ep=%d, is_tx=0x%x, channel=%d\n", |
194 | hw_ep->epnum, is_tx, ch_num); | 199 | hw_ep->epnum, is_tx, ch_num); |
195 | 200 | ||
196 | return &(ux500_channel->channel); | 201 | return &(ux500_channel->channel); |
@@ -199,8 +204,9 @@ static struct dma_channel *ux500_dma_channel_allocate(struct dma_controller *c, | |||
199 | static void ux500_dma_channel_release(struct dma_channel *channel) | 204 | static void ux500_dma_channel_release(struct dma_channel *channel) |
200 | { | 205 | { |
201 | struct ux500_dma_channel *ux500_channel = channel->private_data; | 206 | struct ux500_dma_channel *ux500_channel = channel->private_data; |
207 | struct musb *musb = ux500_channel->controller->private_data; | ||
202 | 208 | ||
203 | DBG(7, "channel=%d\n", ux500_channel->ch_num); | 209 | dev_dbg(musb->controller, "channel=%d\n", ux500_channel->ch_num); |
204 | 210 | ||
205 | if (ux500_channel->is_allocated) { | 211 | if (ux500_channel->is_allocated) { |
206 | ux500_channel->is_allocated = 0; | 212 | ux500_channel->is_allocated = 0; |
@@ -250,8 +256,8 @@ static int ux500_dma_channel_abort(struct dma_channel *channel) | |||
250 | void __iomem *epio = musb->endpoints[ux500_channel->hw_ep->epnum].regs; | 256 | void __iomem *epio = musb->endpoints[ux500_channel->hw_ep->epnum].regs; |
251 | u16 csr; | 257 | u16 csr; |
252 | 258 | ||
253 | DBG(4, "channel=%d, is_tx=%d\n", ux500_channel->ch_num, | 259 | dev_dbg(musb->controller, "channel=%d, is_tx=%d\n", |
254 | ux500_channel->is_tx); | 260 | ux500_channel->ch_num, ux500_channel->is_tx); |
255 | 261 | ||
256 | if (channel->status == MUSB_DMA_STATUS_BUSY) { | 262 | if (channel->status == MUSB_DMA_STATUS_BUSY) { |
257 | if (ux500_channel->is_tx) { | 263 | if (ux500_channel->is_tx) { |