Merge tag 'v3.7-rc1'

[cascardo/linux.git] / drivers / video / omap2 / dss / dispc.c

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index b43477a..7456000 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3671,34 +3671,26 @@ int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask)
 }
 EXPORT_SYMBOL(omap_dispc_unregister_isr);
 
-#ifdef DEBUG
 static void print_irq_status(u32 status)
 {
        if ((status & dispc.irq_error_mask) == 0)
                return;
 
-       printk(KERN_DEBUG "DISPC IRQ: 0x%x: ", status);
-
-#define PIS(x) \
-       if (status & DISPC_IRQ_##x) \
-               printk(#x " ");
-       PIS(GFX_FIFO_UNDERFLOW);
-       PIS(OCP_ERR);
-       PIS(VID1_FIFO_UNDERFLOW);
-       PIS(VID2_FIFO_UNDERFLOW);
-       if (dss_feat_get_num_ovls() > 3)
-               PIS(VID3_FIFO_UNDERFLOW);
-       PIS(SYNC_LOST);
-       PIS(SYNC_LOST_DIGIT);
-       if (dss_has_feature(FEAT_MGR_LCD2))
-               PIS(SYNC_LOST2);
-       if (dss_has_feature(FEAT_MGR_LCD3))
-               PIS(SYNC_LOST3);
+#define PIS(x) (status & DISPC_IRQ_##x) ? (#x " ") : ""
+
+       pr_debug("DISPC IRQ: 0x%x: %s%s%s%s%s%s%s%s%s\n",
+               status,
+               PIS(OCP_ERR),
+               PIS(GFX_FIFO_UNDERFLOW),
+               PIS(VID1_FIFO_UNDERFLOW),
+               PIS(VID2_FIFO_UNDERFLOW),
+               dss_feat_get_num_ovls() > 3 ? PIS(VID3_FIFO_UNDERFLOW) : "",
+               PIS(SYNC_LOST),
+               PIS(SYNC_LOST_DIGIT),
+               dss_has_feature(FEAT_MGR_LCD2) ? PIS(SYNC_LOST2) : "",
+               dss_has_feature(FEAT_MGR_LCD3) ? PIS(SYNC_LOST3) : "");
 #undef PIS
-
-       printk("\n");
 }
-#endif
 
 /* Called from dss.c. Note that we don't touch clocks here,
  * but we presume they are on because we got an IRQ. However,
@@ -3731,10 +3723,8 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *arg)
        spin_unlock(&dispc.irq_stats_lock);
 #endif
 
-#ifdef DEBUG
-       if (dss_debug)
-               print_irq_status(irqstatus);
-#endif
+       print_irq_status(irqstatus);
+
        /* Ack the interrupt. Do it here before clocks are possibly turned
         * off */
        dispc_write_reg(DISPC_IRQSTATUS, irqstatus);