diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:15:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:42 -0400 |
commit | 5ae121705bed9ea7425daef4d7d29038f7312f3f (patch) | |
tree | fa1527459b056ad59acfbf1fa59c5a8880f6ac22 /drivers/video/matrox/matroxfb_Ti3026.c | |
parent | e7a05aa9e697ff6fc165d45671cdcca601942f62 (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_Ti3026.c')
-rw-r--r-- | drivers/video/matrox/matroxfb_Ti3026.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c index 9445cdb759b1..13524821e242 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.c +++ b/drivers/video/matrox/matroxfb_Ti3026.c | |||
@@ -283,7 +283,7 @@ static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* i | |||
283 | unsigned int fvco; | 283 | unsigned int fvco; |
284 | unsigned int lin, lfeed, lpost; | 284 | unsigned int lin, lfeed, lpost; |
285 | 285 | ||
286 | DBG(__FUNCTION__) | 286 | DBG(__func__) |
287 | 287 | ||
288 | fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost); | 288 | fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost); |
289 | fvco >>= (*post = lpost); | 289 | fvco >>= (*post = lpost); |
@@ -297,7 +297,7 @@ static int Ti3026_setpclk(WPMINFO int clk) { | |||
297 | unsigned int pixfeed, pixin, pixpost; | 297 | unsigned int pixfeed, pixin, pixpost; |
298 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); | 298 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); |
299 | 299 | ||
300 | DBG(__FUNCTION__) | 300 | DBG(__func__) |
301 | 301 | ||
302 | f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost); | 302 | f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost); |
303 | 303 | ||
@@ -365,7 +365,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) { | |||
365 | u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT; | 365 | u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT; |
366 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); | 366 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); |
367 | 367 | ||
368 | DBG(__FUNCTION__) | 368 | DBG(__func__) |
369 | 369 | ||
370 | memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg)); | 370 | memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg)); |
371 | switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) { | 371 | switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) { |
@@ -440,7 +440,7 @@ static void ti3026_setMCLK(WPMINFO int fout){ | |||
440 | unsigned int rfhcnt, mclk_ctl; | 440 | unsigned int rfhcnt, mclk_ctl; |
441 | int tmout; | 441 | int tmout; |
442 | 442 | ||
443 | DBG(__FUNCTION__) | 443 | DBG(__func__) |
444 | 444 | ||
445 | f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p); | 445 | f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p); |
446 | 446 | ||
@@ -534,7 +534,7 @@ static void ti3026_setMCLK(WPMINFO int fout){ | |||
534 | 534 | ||
535 | static void ti3026_ramdac_init(WPMINFO2) { | 535 | static void ti3026_ramdac_init(WPMINFO2) { |
536 | 536 | ||
537 | DBG(__FUNCTION__) | 537 | DBG(__func__) |
538 | 538 | ||
539 | ACCESS_FBINFO(features.pll.vco_freq_min) = 110000; | 539 | ACCESS_FBINFO(features.pll.vco_freq_min) = 110000; |
540 | ACCESS_FBINFO(features.pll.ref_freq) = 114545; | 540 | ACCESS_FBINFO(features.pll.ref_freq) = 114545; |
@@ -554,7 +554,7 @@ static void Ti3026_restore(WPMINFO2) { | |||
554 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); | 554 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); |
555 | CRITFLAGS | 555 | CRITFLAGS |
556 | 556 | ||
557 | DBG(__FUNCTION__) | 557 | DBG(__func__) |
558 | 558 | ||
559 | #ifdef DEBUG | 559 | #ifdef DEBUG |
560 | dprintk(KERN_INFO "EXTVGA regs: "); | 560 | dprintk(KERN_INFO "EXTVGA regs: "); |
@@ -662,7 +662,7 @@ static void Ti3026_restore(WPMINFO2) { | |||
662 | 662 | ||
663 | static void Ti3026_reset(WPMINFO2) { | 663 | static void Ti3026_reset(WPMINFO2) { |
664 | 664 | ||
665 | DBG(__FUNCTION__) | 665 | DBG(__func__) |
666 | 666 | ||
667 | ti3026_ramdac_init(PMINFO2); | 667 | ti3026_ramdac_init(PMINFO2); |
668 | } | 668 | } |
@@ -680,7 +680,7 @@ static int Ti3026_preinit(WPMINFO2) { | |||
680 | 2048, 0}; | 680 | 2048, 0}; |
681 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); | 681 | struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); |
682 | 682 | ||
683 | DBG(__FUNCTION__) | 683 | DBG(__func__) |
684 | 684 | ||
685 | ACCESS_FBINFO(millenium) = 1; | 685 | ACCESS_FBINFO(millenium) = 1; |
686 | ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL); | 686 | ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL); |