From 6c7dbbb5c205b7dcf3980445de177766a43d7339 Mon Sep 17 00:00:00 2001
From: Thierry MERLE <thierry.merle@free.fr>
Date: Fri, 4 Apr 2008 21:00:57 -0300
Subject: [PATCH] --- yaml --- r: 92595 b: refs/heads/master c:
 df18c3196a1ec1db7a20997d3246a5a8cf535a77 h: refs/heads/master i:   92593:
 87254fad84f453e3192373e99996b58aefb125b9   92591:
 daaffd5f71cac170c2eabc4f36c7013ff70968e4 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/media/video/usbvision/usbvision-core.c  | 6 ++++--
 trunk/drivers/media/video/usbvision/usbvision-i2c.c   | 6 ++++--
 trunk/drivers/media/video/usbvision/usbvision-video.c | 6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d139816af42a..cb2225b314e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2db42dd4eb53b86a40b96b0b12a7b2d12377bdd
+refs/heads/master: df18c3196a1ec1db7a20997d3246a5a8cf535a77
diff --git a/trunk/drivers/media/video/usbvision/usbvision-core.c b/trunk/drivers/media/video/usbvision/usbvision-core.c
index e518d8a35643..a9c5e5adba3a 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-core.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-core.c
@@ -84,8 +84,10 @@ MODULE_PARM_DESC(adjust_Y_Offset, "adjust Y offset display [core]");
 
 
 #ifdef USBVISION_DEBUG
-	#define PDEBUG(level, fmt, args...) \
-		if (core_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
+	#define PDEBUG(level, fmt, args...) { \
+		if (core_debug & (level)) \
+			info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+	}
 #else
 	#define PDEBUG(level, fmt, args...) do {} while(0)
 #endif
diff --git a/trunk/drivers/media/video/usbvision/usbvision-i2c.c b/trunk/drivers/media/video/usbvision/usbvision-i2c.c
index a7ed6f21f119..e2274d77ea29 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-i2c.c
@@ -45,8 +45,10 @@ static int i2c_debug;
 module_param (i2c_debug, int, 0644);			// debug_i2c_usb mode of the device driver
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
-#define PDEBUG(level, fmt, args...) \
-		if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
+#define PDEBUG(level, fmt, args...) { \
+		if (i2c_debug & (level)) \
+			info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+	}
 
 static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
 			    short len);
diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c
index 13f378c4439e..d97261ab430f 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-video.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-video.c
@@ -97,10 +97,10 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL)
 
 
 #ifdef USBVISION_DEBUG
-	#define PDEBUG(level, fmt, args...) \
+	#define PDEBUG(level, fmt, args...) { \
 		if (video_debug & (level)) \
-			info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ ,\
-				## args)
+			info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+	}
 #else
 	#define PDEBUG(level, fmt, args...) do {} while(0)
 #endif