diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:05:25 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:05:25 -0600 |
| commit | 0084abeb68f8870c6758ca9d9c957a673cc5eb4e (patch) | |
| tree | d6a3a3dd463a2f7b74b3ce0b9ed349710d9329f3 /drivers | |
| parent | d0281f07c503f73cc006444ba329536d618a2116 (diff) | |
CR TLSbo90151: Fix invalid debugging printk & remove self-defined debug in VPU driver
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-fix_vpu_debugging_printks.patch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mxc/vpu/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/mxc/vpu/Makefile | 10 | ||||
| -rw-r--r-- | drivers/mxc/vpu/mxc_vpu.c | 9 |
3 files changed, 13 insertions, 14 deletions
diff --git a/drivers/mxc/vpu/Kconfig b/drivers/mxc/vpu/Kconfig index 7e6de6a9deed..29598c8607e5 100644 --- a/drivers/mxc/vpu/Kconfig +++ b/drivers/mxc/vpu/Kconfig @@ -2,18 +2,18 @@ # Codec configuration # -menu "H.264 VPU Codec support" +menu "MXC VPU(Video Processing Unit) support" config MXC_VPU - tristate "Support for mx27 H.264 VPU codec" + tristate "Support for MXC VPU(Video Processing Unit)" help - The VPU codec device provides codec function for h.264/mpeg4/h.263 + The VPU codec device provides codec function for H.264/MPEG4/H.263 config MXC_VPU_DEBUG bool "MXC VPU debugging" depends on MXC_VPU != n help - This is an option for use by developers; most people should + This is an option for the developers; most people should say N here. This enables MXC VPU driver debugging. endmenu diff --git a/drivers/mxc/vpu/Makefile b/drivers/mxc/vpu/Makefile index 4a04dede65e8..1a821f4921cb 100644 --- a/drivers/mxc/vpu/Makefile +++ b/drivers/mxc/vpu/Makefile @@ -1,7 +1,9 @@ -# Makefile for the Linux VPU drivers. -# 25 May 2006 - -# Each configuration option enables a list of files. +# +# Makefile for the VPU drivers. +# obj-$(CONFIG_MXC_VPU) += mxc_vpu.o +ifeq ($(CONFIG_MXC_VPU_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c index 3a3172bdb2c4..cb2fcdd1fb52 100644 --- a/drivers/mxc/vpu/mxc_vpu.c +++ b/drivers/mxc/vpu/mxc_vpu.c @@ -19,11 +19,7 @@ * @ingroup VPU */ -#ifdef CONFIG_MXC_VPU_DEBUG -#define DEBUG #include <linux/kernel.h> -#endif - #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/autoconf.h> @@ -248,10 +244,11 @@ static int vpu_ioctl(struct inode *inode, struct file *filp, u_int cmd, if (!wait_event_interruptible_timeout (vpu_queue, codec_done != 0, msecs_to_jiffies(timeout))) { - printk("VPU blocking: timeout.\n"); + printk(KERN_WARNING "VPU blocking: timeout.\n"); ret = -ETIME; } else if (signal_pending(current)) { - printk("VPU interrupt received.\n"); + printk(KERN_WARNING + "VPU interrupt received.\n"); ret = -ERESTARTSYS; } |