mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-27 14:43:58 +08:00
dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
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>
This commit is contained in:
parent
cd5cf9da02
commit
f9b283a6e4
@ -227,8 +227,8 @@ static inline int imxdma_sg_next(struct imxdma_desc *d)
|
|||||||
|
|
||||||
imx_dmav1_writel(imxdma, now, DMA_CNTR(imxdmac->channel));
|
imx_dmav1_writel(imxdma, now, DMA_CNTR(imxdmac->channel));
|
||||||
|
|
||||||
pr_debug("imxdma%d: next sg chunk dst 0x%08x, src 0x%08x, "
|
dev_dbg(imxdma->dev, " %s channel: %d dst 0x%08x, src 0x%08x, "
|
||||||
"size 0x%08x\n", imxdmac->channel,
|
"size 0x%08x\n", __func__, imxdmac->channel,
|
||||||
imx_dmav1_readl(imxdma, DMA_DAR(imxdmac->channel)),
|
imx_dmav1_readl(imxdma, DMA_DAR(imxdmac->channel)),
|
||||||
imx_dmav1_readl(imxdma, DMA_SAR(imxdmac->channel)),
|
imx_dmav1_readl(imxdma, DMA_SAR(imxdmac->channel)),
|
||||||
imx_dmav1_readl(imxdma, DMA_CNTR(imxdmac->channel)));
|
imx_dmav1_readl(imxdma, DMA_CNTR(imxdmac->channel)));
|
||||||
@ -243,7 +243,7 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
|
|||||||
int channel = imxdmac->channel;
|
int channel = imxdmac->channel;
|
||||||
unsigned long flags;
|
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);
|
local_irq_save(flags);
|
||||||
|
|
||||||
@ -274,7 +274,7 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)
|
|||||||
int channel = imxdmac->channel;
|
int channel = imxdmac->channel;
|
||||||
unsigned long flags;
|
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))
|
if (imxdma_hw_chain(imxdmac))
|
||||||
del_timer(&imxdmac->watchdog);
|
del_timer(&imxdmac->watchdog);
|
||||||
@ -298,7 +298,8 @@ static void imxdma_watchdog(unsigned long data)
|
|||||||
|
|
||||||
/* Tasklet watchdog error handler */
|
/* Tasklet watchdog error handler */
|
||||||
tasklet_schedule(&imxdmac->dma_tasklet);
|
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)
|
static irqreturn_t imxdma_err_handler(int irq, void *dev_id)
|
||||||
@ -426,8 +427,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
|
|||||||
|
|
||||||
disr = imx_dmav1_readl(imxdma, DMA_DISR);
|
disr = imx_dmav1_readl(imxdma, DMA_DISR);
|
||||||
|
|
||||||
pr_debug("imxdma: dma_irq_handler called, disr=0x%08x\n",
|
dev_dbg(imxdma->dev, "%s called, disr=0x%08x\n", __func__, disr);
|
||||||
disr);
|
|
||||||
|
|
||||||
imx_dmav1_writel(imxdma, disr, DMA_DISR);
|
imx_dmav1_writel(imxdma, disr, DMA_DISR);
|
||||||
for (i = 0; i < IMX_DMA_CHANNELS; i++) {
|
for (i = 0; i < IMX_DMA_CHANNELS; i++) {
|
||||||
@ -875,14 +875,14 @@ static int __init imxdma_probe(struct platform_device *pdev)
|
|||||||
if (cpu_is_mx1()) {
|
if (cpu_is_mx1()) {
|
||||||
ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", imxdma);
|
ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", imxdma);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_crit("Can't register IRQ for DMA\n");
|
dev_warn(imxdma->dev, "Can't register IRQ for DMA\n");
|
||||||
kfree(imxdma);
|
kfree(imxdma);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = request_irq(MX1_DMA_ERR, imxdma_err_handler, 0, "DMA", imxdma);
|
ret = request_irq(MX1_DMA_ERR, imxdma_err_handler, 0, "DMA", imxdma);
|
||||||
if (ret) {
|
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);
|
free_irq(MX1_DMA_INT, NULL);
|
||||||
kfree(imxdma);
|
kfree(imxdma);
|
||||||
return ret;
|
return ret;
|
||||||
@ -912,7 +912,8 @@ static int __init imxdma_probe(struct platform_device *pdev)
|
|||||||
ret = request_irq(MX2x_INT_DMACH0 + i,
|
ret = request_irq(MX2x_INT_DMACH0 + i,
|
||||||
dma_irq_handler, 0, "DMA", imxdma);
|
dma_irq_handler, 0, "DMA", imxdma);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_crit("Can't register IRQ %d for DMA channel %d\n",
|
dev_warn(imxdma->dev, "Can't register IRQ %d "
|
||||||
|
"for DMA channel %d\n",
|
||||||
MX2x_INT_DMACH0 + i, i);
|
MX2x_INT_DMACH0 + i, i);
|
||||||
goto err_init;
|
goto err_init;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user