]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] omap4iss: Don't check for DEBUG when printing IRQ debugging messages
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Fri, 28 Mar 2014 17:38:17 +0000 (14:38 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 23 May 2014 15:00:45 +0000 (12:00 -0300)
Now that the VIDEO_OMAP4_DEBUG Kconfig option has been removed in favour
of dynamic printk, the DEBUG macro isn't defined anymore. Don't check
for it to guard IRQ debugging messages compilation, as they're already
guarded by the ISS_ISR_DEBUG macro.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/staging/media/omap4iss/iss.c

index 61fbfcd13582b9ac79a74375f21a53c4df9a4e79..219519d0f0296b02a3514a4b40f89fcb567fff58 100644 (file)
@@ -204,7 +204,7 @@ void omap4iss_configure_bridge(struct iss_device *iss,
        iss_reg_write(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL, isp5ctrl_val);
 }
 
-#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
+#ifdef ISS_ISR_DEBUG
 static void iss_isr_dbg(struct iss_device *iss, u32 irqstatus)
 {
        static const char * const name[] = {
@@ -347,14 +347,14 @@ static irqreturn_t iss_isr(int irq, void *_iss)
                        omap4iss_resizer_isr(&iss->resizer,
                                             isp_irqstatus & resizer_events);
 
-#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
+#ifdef ISS_ISR_DEBUG
                iss_isp_isr_dbg(iss, isp_irqstatus);
 #endif
        }
 
        omap4iss_flush(iss);
 
-#if defined(DEBUG) && defined(ISS_ISR_DEBUG)
+#ifdef ISS_ISR_DEBUG
        iss_isr_dbg(iss, irqstatus);
 #endif