diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-05 14:35:32 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:16:55 +0200 |
| commit | 0c78d405f87b50f306f0708dde06de085b344f4e (patch) | |
| tree | f08217665ef90cbfe84e708c961828853f7cf603 | |
| parent | 7f5fe6e8904eb6c47e9af8fe7fd911c44d7f518d (diff) | |
Lee's chunk to make the kernel compile
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/clock.c | 1 | ||||
| -rw-r--r-- | drivers/misc/hwmem/hwmem-main.c | 3 | ||||
| -rw-r--r-- | drivers/usb/musb/ux500_dma.c | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index b6fbd9eb3c7..2e4a6c6cb51 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c @@ -7,6 +7,7 @@ * published by the Free Software Foundation. */ #include <linux/module.h> +#include <linux/err.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/spinlock.h> diff --git a/drivers/misc/hwmem/hwmem-main.c b/drivers/misc/hwmem/hwmem-main.c index 9162ff4fc91..b91d99bc2be 100644 --- a/drivers/misc/hwmem/hwmem-main.c +++ b/drivers/misc/hwmem/hwmem-main.c @@ -240,9 +240,10 @@ struct hwmem_alloc *hwmem_alloc(size_t size, enum hwmem_alloc_flags flags, alloc->flags = flags; alloc->default_access = def_access; INIT_LIST_HEAD(&alloc->threadg_info_list); +#ifdef CONFIG_DEBUG_FS alloc->creator = __builtin_return_address(0); alloc->creator_tgid = task_tgid_nr(current); - +#endif alloc->mem_type = resolve_mem_type(mem_type); if (IS_ERR(alloc->mem_type)) { ret = PTR_ERR(alloc->mem_type); diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index cecace41183..75ed4ff3b7d 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -65,7 +65,7 @@ static void ux500_tx_work(struct work_struct *data) struct musb *musb = hw_ep->musb; unsigned long flags; - DBG(4, "DMA tx transfer done on hw_ep=%d\n", hw_ep->epnum); + pr_warning("DMA tx transfer done on hw_ep=%d\n", hw_ep->epnum); spin_lock_irqsave(&musb->lock, flags); ux500_channel->channel.actual_len = ux500_channel->cur_len; @@ -84,7 +84,7 @@ static void ux500_rx_work(struct work_struct *data) struct musb *musb = hw_ep->musb; unsigned long flags; - DBG(4, "DMA rx transfer done on hw_ep=%d\n", hw_ep->epnum); + pr_warning("DMA rx transfer done on hw_ep=%d\n", hw_ep->epnum); spin_lock_irqsave(&musb->lock, flags); ux500_channel->channel.actual_len = ux500_channel->cur_len; @@ -117,7 +117,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, dma_addr_t usb_fifo_addr = (MUSB_FIFO_OFFSET(hw_ep->epnum) + ux500_channel->controller->phy_base); - DBG(4, "packet_sz=%d, mode=%d, dma_addr=0x%x, len=%d is_tx=%d\n", + pr_warning("packet_sz=%d, mode=%d, dma_addr=0x%x, len=%d is_tx=%d\n", packet_sz, mode, dma_addr, len, ux500_channel->is_tx); ux500_channel->cur_len = len; @@ -192,7 +192,7 @@ static struct dma_channel *ux500_dma_channel_allocate(struct dma_controller *c, ux500_channel->hw_ep = hw_ep; ux500_channel->is_allocated = 1; - DBG(7, "hw_ep=%d, is_tx=0x%x, channel=%d\n", + pr_devel("hw_ep=%d, is_tx=0x%x, channel=%d\n", hw_ep->epnum, is_tx, ch_num); return &(ux500_channel->channel); @@ -202,7 +202,7 @@ static void ux500_dma_channel_release(struct dma_channel *channel) { struct ux500_dma_channel *ux500_channel = channel->private_data; - DBG(7, "channel=%d\n", ux500_channel->ch_num); + pr_devel("channel=%d\n", ux500_channel->ch_num); if (ux500_channel->is_allocated) { ux500_channel->is_allocated = 0; @@ -252,7 +252,7 @@ static int ux500_dma_channel_abort(struct dma_channel *channel) void __iomem *epio = musb->endpoints[ux500_channel->hw_ep->epnum].regs; u16 csr; - DBG(4, "channel=%d, is_tx=%d\n", ux500_channel->ch_num, + pr_warning("channel=%d, is_tx=%d\n", ux500_channel->ch_num, ux500_channel->is_tx); if (channel->status == MUSB_DMA_STATUS_BUSY) { |