Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap1 / lcd_dma.c

diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c
index 5769c71815b2e3a6b8324ab17764824791723de5..ed42628611bc23953c7e05a33b6a19c3fee6a34a 100644 (file)
--- a/arch/arm/mach-omap1/lcd_dma.c
+++ b/arch/arm/mach-omap1/lcd_dma.c
@@ -113,8 +113,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror);
 void omap_set_lcd_dma_b1_vxres(unsigned long vxres)
 {
        if (cpu_is_omap15xx()) {
-               printk(KERN_ERR "DMA virtual resolution is not supported "
-                               "in 1510 mode\n");
+               pr_err("DMA virtual resolution is not supported in 1510 mode\n");
                BUG();
        }
        lcd_dma.vxres = vxres;
@@ -437,8 +436,7 @@ static int __init omap_init_lcd_dma(void)
        r = request_irq(INT_DMA_LCD, lcd_dma_irq_handler, 0,
                        "LCD DMA", NULL);
        if (r != 0)
-               printk(KERN_ERR "unable to request IRQ for LCD DMA "
-                              "(error %d)\n", r);
+               pr_err("unable to request IRQ for LCD DMA (error %d)\n", r);
 
        return r;
 }