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_misc.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_misc.c')
-rw-r--r-- | drivers/video/matrox/matroxfb_misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c index ab7fb50bc1de..aaa3e538e5da 100644 --- a/drivers/video/matrox/matroxfb_misc.c +++ b/drivers/video/matrox/matroxfb_misc.c | |||
@@ -90,13 +90,13 @@ | |||
90 | #include <linux/matroxfb.h> | 90 | #include <linux/matroxfb.h> |
91 | 91 | ||
92 | void matroxfb_DAC_out(CPMINFO int reg, int val) { | 92 | void matroxfb_DAC_out(CPMINFO int reg, int val) { |
93 | DBG_REG(__FUNCTION__) | 93 | DBG_REG(__func__) |
94 | mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg); | 94 | mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg); |
95 | mga_outb(M_RAMDAC_BASE+M_X_DATAREG, val); | 95 | mga_outb(M_RAMDAC_BASE+M_X_DATAREG, val); |
96 | } | 96 | } |
97 | 97 | ||
98 | int matroxfb_DAC_in(CPMINFO int reg) { | 98 | int matroxfb_DAC_in(CPMINFO int reg) { |
99 | DBG_REG(__FUNCTION__) | 99 | DBG_REG(__func__) |
100 | mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg); | 100 | mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg); |
101 | return mga_inb(M_RAMDAC_BASE+M_X_DATAREG); | 101 | return mga_inb(M_RAMDAC_BASE+M_X_DATAREG); |
102 | } | 102 | } |
@@ -104,7 +104,7 @@ int matroxfb_DAC_in(CPMINFO int reg) { | |||
104 | void matroxfb_var2my(struct fb_var_screeninfo* var, struct my_timming* mt) { | 104 | void matroxfb_var2my(struct fb_var_screeninfo* var, struct my_timming* mt) { |
105 | unsigned int pixclock = var->pixclock; | 105 | unsigned int pixclock = var->pixclock; |
106 | 106 | ||
107 | DBG(__FUNCTION__) | 107 | DBG(__func__) |
108 | 108 | ||
109 | if (!pixclock) pixclock = 10000; /* 10ns = 100MHz */ | 109 | if (!pixclock) pixclock = 10000; /* 10ns = 100MHz */ |
110 | mt->pixclock = 1000000000 / pixclock; | 110 | mt->pixclock = 1000000000 / pixclock; |
@@ -131,7 +131,7 @@ int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int f | |||
131 | unsigned int fwant; | 131 | unsigned int fwant; |
132 | unsigned int p; | 132 | unsigned int p; |
133 | 133 | ||
134 | DBG(__FUNCTION__) | 134 | DBG(__func__) |
135 | 135 | ||
136 | fwant = freq; | 136 | fwant = freq; |
137 | 137 | ||
@@ -192,7 +192,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) { | |||
192 | int i; | 192 | int i; |
193 | struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw); | 193 | struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw); |
194 | 194 | ||
195 | DBG(__FUNCTION__) | 195 | DBG(__func__) |
196 | 196 | ||
197 | hw->SEQ[0] = 0x00; | 197 | hw->SEQ[0] = 0x00; |
198 | hw->SEQ[1] = 0x01; /* or 0x09 */ | 198 | hw->SEQ[1] = 0x01; /* or 0x09 */ |
@@ -336,7 +336,7 @@ void matroxfb_vgaHWrestore(WPMINFO2) { | |||
336 | struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw); | 336 | struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw); |
337 | CRITFLAGS | 337 | CRITFLAGS |
338 | 338 | ||
339 | DBG(__FUNCTION__) | 339 | DBG(__func__) |
340 | 340 | ||
341 | dprintk(KERN_INFO "MiscOutReg: %02X\n", hw->MiscOutReg); | 341 | dprintk(KERN_INFO "MiscOutReg: %02X\n", hw->MiscOutReg); |
342 | dprintk(KERN_INFO "SEQ regs: "); | 342 | dprintk(KERN_INFO "SEQ regs: "); |