aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2008-04-04 20:00:57 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:58 -0400
commitdf18c3196a1ec1db7a20997d3246a5a8cf535a77 (patch)
treeaf609553d18ce28f00954542a7a4a23c842a843b
parentd2db42dd4eb53b86a40b96b0b12a7b2d12377bdd (diff)
V4L/DVB (7503): usbvision: rename __PRETTY_FUNCTION__ occurrences
__PRETTY_FUNCTION__ has no sense in C lang context. Rename it as __func__ Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/usbvision/usbvision-core.c6
-rw-r--r--drivers/media/video/usbvision/usbvision-i2c.c6
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c6
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 e518d8a3564..a9c5e5adba3 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]");
84 84
85 85
86#ifdef USBVISION_DEBUG 86#ifdef USBVISION_DEBUG
87 #define PDEBUG(level, fmt, args...) \ 87 #define PDEBUG(level, fmt, args...) { \
88 if (core_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args) 88 if (core_debug & (level)) \
89 info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
90 }
89#else 91#else
90 #define PDEBUG(level, fmt, args...) do {} while(0) 92 #define PDEBUG(level, fmt, args...) do {} while(0)
91#endif 93#endif
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index a7ed6f21f11..e2274d77ea2 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;
45module_param (i2c_debug, int, 0644); // debug_i2c_usb mode of the device driver 45module_param (i2c_debug, int, 0644); // debug_i2c_usb mode of the device driver
46MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); 46MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
47 47
48#define PDEBUG(level, fmt, args...) \ 48#define PDEBUG(level, fmt, args...) { \
49 if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args) 49 if (i2c_debug & (level)) \
50 info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
51 }
50 52
51static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf, 53static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
52 short len); 54 short len);
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 13f378c4439..d97261ab430 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)
97 97
98 98
99#ifdef USBVISION_DEBUG 99#ifdef USBVISION_DEBUG
100 #define PDEBUG(level, fmt, args...) \ 100 #define PDEBUG(level, fmt, args...) { \
101 if (video_debug & (level)) \ 101 if (video_debug & (level)) \
102 info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ ,\ 102 info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
103 ## args) 103 }
104#else 104#else
105 #define PDEBUG(level, fmt, args...) do {} while(0) 105 #define PDEBUG(level, fmt, args...) do {} while(0)
106#endif 106#endif