aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 05:15:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:42 -0400
commit5ae121705bed9ea7425daef4d7d29038f7312f3f (patch)
treefa1527459b056ad59acfbf1fa59c5a8880f6ac22 /drivers/video/nvidia
parente7a05aa9e697ff6fc165d45671cdcca601942f62 (diff)
video: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Antonino Daplas <adaplas@gmail.com> Cc: Antonino A. Daplas <adaplas@gmail.com> Cc: Antonino Daplas <adaplas@pol.net> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Jean Delvare <khali@linux-fr.org> Cc: Adrian Bunk <bunk@stusta.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r--drivers/video/nvidia/nvidia.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 4f46e9cf8cca..9dbb5a5a267b 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -43,14 +43,14 @@
43#define NVTRACE if (0) printk 43#define NVTRACE if (0) printk
44#endif 44#endif
45 45
46#define NVTRACE_ENTER(...) NVTRACE("%s START\n", __FUNCTION__) 46#define NVTRACE_ENTER(...) NVTRACE("%s START\n", __func__)
47#define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __FUNCTION__) 47#define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __func__)
48 48
49#ifdef CONFIG_FB_NVIDIA_DEBUG 49#ifdef CONFIG_FB_NVIDIA_DEBUG
50#define assert(expr) \ 50#define assert(expr) \
51 if (!(expr)) { \ 51 if (!(expr)) { \
52 printk( "Assertion failed! %s,%s,%s,line=%d\n",\ 52 printk( "Assertion failed! %s,%s,%s,line=%d\n",\
53 #expr,__FILE__,__FUNCTION__,__LINE__); \ 53 #expr,__FILE__,__func__,__LINE__); \
54 BUG(); \ 54 BUG(); \
55 } 55 }
56#else 56#else