8 files changed, 14 insertions, 11 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h
index 752a10d2d..97aa765b8 100644
--- a/linux/drivers/media/common/saa7146.h
+++ b/linux/drivers/media/common/saa7146.h
@@ -31,8 +31,14 @@
 #define BUG_ON(condition) do { if ((condition)!=0) BUG(); } while(0)
 #define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && 0 != dev->ext->vbi)
 
+/* this ugly preprocessor hack is necessary to convert stuff into
+   strings. since stuff can be a preprocessor token itself (like KBUILD_MODNAME is)
+   two stages are necessary */
+#define __stringify_fs(x) #x
+#define __stringify(x) __stringify_fs(x)
+
 extern int debug;
-#define DEBUG_PROLOG printk("%s: %s(): ","KBUILD_MODNAME",__FUNCTION__)
+#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__)
 
 #define DEB_S(x)    if (0!=(debug&0x01)) { DEBUG_PROLOG; printk x; } /* simple debug messages */
 #define DEB_D(x)    if (0!=(debug&0x02)) { DEBUG_PROLOG; printk x; } /* more detailed debug messages */
@@ -43,7 +49,7 @@ extern int debug;
 #define DEB_CAP(x)  if (0!=(debug&0x40)) { DEBUG_PROLOG; printk x; } /* capture debug messages */
 
 #define ERR(x) { DEBUG_PROLOG; printk x; }
-#define INFO(x) { printk("%s: ","KBUILD_MODNAME"); printk x; }
+#define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; }
 
 #define IER_DISABLE(x,y) \
 	saa7146_write(x, IER, saa7146_read(x, IER) & ~(y));
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c
index 82b018be2..21d1fde81 100644
--- a/linux/drivers/media/common/saa7146_core.c
+++ b/linux/drivers/media/common/saa7146_core.c
@@ -32,7 +32,7 @@ struct semaphore devices_lock;
 
 int saa7146_num = 0;
 /* fixme */
-int debug = 255;
+int debug = 247;
 
 #ifdef MODULE
 MODULE_PARM(debug,"i");
diff --git a/linux/drivers/media/common/saa7146_hlp.c b/linux/drivers/media/common/saa7146_hlp.c
index 89959ae93..fd7a9033f 100644
--- a/linux/drivers/media/common/saa7146_hlp.c
+++ b/linux/drivers/media/common/saa7146_hlp.c
@@ -1,6 +1,6 @@
 #include "saa7146.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME "saa7146"
+	#define KBUILD_MODNAME saa7146
 #endif
 
 #define my_min(type,x,y) \
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c
index 995ef5883..d4c8446b8 100644
--- a/linux/drivers/media/common/saa7146_i2c.c
+++ b/linux/drivers/media/common/saa7146_i2c.c
@@ -1,6 +1,6 @@
 #include "saa7146.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME "saa7146"
+	#define KBUILD_MODNAME saa7146
 #endif
 
 /* helper function */
diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c
index 4a8528295..d69049a7b 100644
--- a/linux/drivers/media/common/saa7146_vbi.c
+++ b/linux/drivers/media/common/saa7146_vbi.c
@@ -1,6 +1,6 @@
 #include "saa7146.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME "saa7146"
+	#define KBUILD_MODNAME saa7146
 #endif
 
 static int vbi_pixel_to_capture = 720 * 2;
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index b92f623eb..735451060 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -1,6 +1,6 @@
 #include "saa7146.h"
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME "saa7146"
+	#define KBUILD_MODNAME saa7146
 #endif
 
 int memory = 32;
diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c
index 094cbbf9a..d7ad7cfd1 100644
--- a/linux/drivers/media/video/mxb.c
+++ b/linux/drivers/media/video/mxb.c
@@ -28,7 +28,7 @@
 #include <linux/video_decoder.h>	/* for saa7111a */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME "mxb"
+	#define KBUILD_MODNAME mxb
 #endif
 
 #define I2C_SAA7111A            0x24
diff --git a/linux/drivers/media/video/saa7111.c b/linux/drivers/media/video/saa7111.c
index ad2efed8b..256654ad3 100644
--- a/linux/drivers/media/video/saa7111.c
+++ b/linux/drivers/media/video/saa7111.c
@@ -209,13 +209,10 @@ static int saa7111_command(struct i2c_client *client, unsigned int cmd,
 		{
 			int i = 0;
 			struct video_decoder_init *init = arg;
-			printk("DECODER_INIT: %d\n",init->count);
 			i = i2c_master_send(client, init->data, init->count);
 			if (i < 0) {
-				printk(KERN_ERR "DECODER_INIT failed.");
 				return -EFAULT;
 			} else {
-				printk(KERN_ERR "DECODER_INIT ok.");
 			}
 		}
 		break;