3 files changed, 11 insertions, 7 deletions

diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index e518d8a35643..a9c5e5adba3a 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/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/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index a7ed6f21f119..e2274d77ea29 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/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/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 13f378c4439e..d97261ab430f 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/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