Skip to content

Commit

Permalink
dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
Browse files Browse the repository at this point in the history 
There were some 'pr_crit' and 'pr_debug' messages due to the
initial merge. Replace them by 'dev_dbg' and 'dev_warn' to be
consistent.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Javier Martin authored and Vinod Koul committed Mar 26, 2012
1 parent cd5cf9d commit f9b283a
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions drivers/dma/imx-dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ static inline int imxdma_sg_next(struct imxdma_desc *d)

imx_dmav1_writel(imxdma, now, DMA_CNTR(imxdmac->channel));

pr_debug("imxdma%d: next sg chunk dst 0x%08x, src 0x%08x, "
"size 0x%08x\n", imxdmac->channel,
dev_dbg(imxdma->dev, " %s channel: %d dst 0x%08x, src 0x%08x, "
"size 0x%08x\n", __func__, imxdmac->channel,
imx_dmav1_readl(imxdma, DMA_DAR(imxdmac->channel)),
imx_dmav1_readl(imxdma, DMA_SAR(imxdmac->channel)),
imx_dmav1_readl(imxdma, DMA_CNTR(imxdmac->channel)));
Expand All @@ -243,7 +243,7 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
int channel = imxdmac->channel;
unsigned long flags;

pr_debug("imxdma%d: imx_dma_enable\n", channel);
dev_dbg(imxdma->dev, "%s channel %d\n", __func__, channel);

local_irq_save(flags);

Expand Down Expand Up @@ -274,7 +274,7 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)
int channel = imxdmac->channel;
unsigned long flags;

pr_debug("imxdma%d: imx_dma_disable\n", channel);
dev_dbg(imxdma->dev, "%s channel %d\n", __func__, channel);

if (imxdma_hw_chain(imxdmac))
del_timer(&imxdmac->watchdog);
Expand All @@ -298,7 +298,8 @@ static void imxdma_watchdog(unsigned long data)

/* Tasklet watchdog error handler */
tasklet_schedule(&imxdmac->dma_tasklet);
pr_debug("imxdma%d: watchdog timeout!\n", imxdmac->channel);
dev_dbg(imxdma->dev, "channel %d: watchdog timeout!\n",
imxdmac->channel);
}

static irqreturn_t imxdma_err_handler(int irq, void *dev_id)
Expand Down Expand Up @@ -426,8 +427,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)

disr = imx_dmav1_readl(imxdma, DMA_DISR);

pr_debug("imxdma: dma_irq_handler called, disr=0x%08x\n",
disr);
dev_dbg(imxdma->dev, "%s called, disr=0x%08x\n", __func__, disr);

imx_dmav1_writel(imxdma, disr, DMA_DISR);
for (i = 0; i < IMX_DMA_CHANNELS; i++) {
Expand Down Expand Up @@ -875,14 +875,14 @@ static int __init imxdma_probe(struct platform_device *pdev)
if (cpu_is_mx1()) {
ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", imxdma);
if (ret) {
pr_crit("Can't register IRQ for DMA\n");
dev_warn(imxdma->dev, "Can't register IRQ for DMA\n");
kfree(imxdma);
return ret;
}

ret = request_irq(MX1_DMA_ERR, imxdma_err_handler, 0, "DMA", imxdma);
if (ret) {
pr_crit("Can't register ERRIRQ for DMA\n");
dev_warn(imxdma->dev, "Can't register ERRIRQ for DMA\n");
free_irq(MX1_DMA_INT, NULL);
kfree(imxdma);
return ret;
Expand Down Expand Up @@ -912,8 +912,9 @@ static int __init imxdma_probe(struct platform_device *pdev)
ret = request_irq(MX2x_INT_DMACH0 + i,
dma_irq_handler, 0, "DMA", imxdma);
if (ret) {
pr_crit("Can't register IRQ %d for DMA channel %d\n",
MX2x_INT_DMACH0 + i, i);
dev_warn(imxdma->dev, "Can't register IRQ %d "
"for DMA channel %d\n",
MX2x_INT_DMACH0 + i, i);
goto err_init;
}
init_timer(&imxdmac->watchdog);
Expand Down

0 comments on commit f9b283a

Please sign in to comment.