aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/matrox/matroxfb_accel.c
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/matrox/matroxfb_accel.c
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/matrox/matroxfb_accel.c')
-rw-r--r--drivers/video/matrox/matroxfb_accel.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index 3660d2673bdc..9c3aeee1cc4f 100644
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -113,7 +113,7 @@ void matrox_cfbX_init(WPMINFO2) {
113 u_int32_t mopmode; 113 u_int32_t mopmode;
114 int accel; 114 int accel;
115 115
116 DBG(__FUNCTION__) 116 DBG(__func__)
117 117
118 mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual; 118 mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual;
119 119
@@ -199,7 +199,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx
199 int start, end; 199 int start, end;
200 CRITFLAGS 200 CRITFLAGS
201 201
202 DBG(__FUNCTION__) 202 DBG(__func__)
203 203
204 CRITBEGIN 204 CRITBEGIN
205 205
@@ -235,7 +235,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in
235 int start, end; 235 int start, end;
236 CRITFLAGS 236 CRITFLAGS
237 237
238 DBG(__FUNCTION__) 238 DBG(__func__)
239 239
240 CRITBEGIN 240 CRITBEGIN
241 241
@@ -287,7 +287,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he
287 int width) { 287 int width) {
288 CRITFLAGS 288 CRITFLAGS
289 289
290 DBG(__FUNCTION__) 290 DBG(__func__)
291 291
292 CRITBEGIN 292 CRITBEGIN
293 293
@@ -315,7 +315,7 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh
315 int whattodo; 315 int whattodo;
316 CRITFLAGS 316 CRITFLAGS
317 317
318 DBG(__FUNCTION__) 318 DBG(__func__)
319 319
320 CRITBEGIN 320 CRITBEGIN
321 321
@@ -388,7 +388,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
388 int easy; 388 int easy;
389 CRITFLAGS 389 CRITFLAGS
390 390
391 DBG_HEAVY(__FUNCTION__); 391 DBG_HEAVY(__func__);
392 392
393 step = (width + 7) >> 3; 393 step = (width + 7) >> 3;
394 charcell = height * step; 394 charcell = height * step;
@@ -469,7 +469,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
469static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) { 469static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) {
470 MINFO_FROM_INFO(info); 470 MINFO_FROM_INFO(info);
471 471
472 DBG_HEAVY(__FUNCTION__); 472 DBG_HEAVY(__func__);
473 473
474 if (image->depth == 1) { 474 if (image->depth == 1) {
475 u_int32_t fgx, bgx; 475 u_int32_t fgx, bgx;