Skip to content

K
Kernel

openeuler / Kernel
11 个月 前同步成功

通知 5
Star 0
Fork 0
K
Kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 5ae12170 编写于 作者: H Harvey Harrison 提交者： Linus Torvalds
浏览文件
操作

video: replace remaining __FUNCTION__ occurrences 

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: NHarvey 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e7a05aa9
显示空白变更内容
内联 并排
Showing with 106 addition and 106 deletion
drivers/video/amifb.c
浏览文件 @ 5ae12170
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
#endif #endif
#ifdef DEBUG #ifdef DEBUG
# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
#else #else
# define DPRINTK(fmt, args...) # define DPRINTK(fmt, args...)
#endif #endif
......
drivers/video/aty/aty128fb.c
浏览文件 @ 5ae12170
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#undef DEBUG #undef DEBUG
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt, args...) printk(KERN_DEBUG "aty128fb: %s " fmt, __FUNCTION__, ##args); #define DBG(fmt, args...) printk(KERN_DEBUG "aty128fb: %s " fmt, __func__, ##args);
#else #else
#define DBG(fmt, args...) #define DBG(fmt, args...)
#endif #endif
......
drivers/video/aty/mach64_ct.c
浏览文件 @ 5ae12170
...@@ -197,7 +197,7 @@ static int aty_dsp_gt(const struct fb_info *info, u32 bpp, struct pll_ct *pll) ...@@ -197,7 +197,7 @@ static int aty_dsp_gt(const struct fb_info *info, u32 bpp, struct pll_ct *pll)
pll->dsp_config = (dsp_precision << 20) | (pll->dsp_loop_latency << 16) | dsp_xclks; pll->dsp_config = (dsp_precision << 20) | (pll->dsp_loop_latency << 16) | dsp_xclks;
#ifdef DEBUG #ifdef DEBUG
printk("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n", printk("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n",
__FUNCTION__, pll->dsp_config, pll->dsp_on_off); __func__, pll->dsp_config, pll->dsp_on_off);
#endif #endif
return 0; return 0;
} }
...@@ -225,7 +225,7 @@ static int aty_valid_pll_ct(const struct fb_info *info, u32 vclk_per, struct pll ...@@ -225,7 +225,7 @@ static int aty_valid_pll_ct(const struct fb_info *info, u32 vclk_per, struct pll
(par->ref_clk_per * pll->pll_ref_div); (par->ref_clk_per * pll->pll_ref_div);
#ifdef DEBUG #ifdef DEBUG
printk("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n", printk("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n",
__FUNCTION__, pllvclk, pllvclk / pll->vclk_post_div_real); __func__, pllvclk, pllvclk / pll->vclk_post_div_real);
#endif #endif
pll->pll_vclk_cntl = 0x03; /* VCLK = PLL_VCLK/VCLKx_POST */ pll->pll_vclk_cntl = 0x03; /* VCLK = PLL_VCLK/VCLKx_POST */
...@@ -269,7 +269,7 @@ static u32 aty_pll_to_var_ct(const struct fb_info *info, const union aty_pll *pl ...@@ -269,7 +269,7 @@ static u32 aty_pll_to_var_ct(const struct fb_info *info, const union aty_pll *pl
} }
#endif #endif
#ifdef DEBUG #ifdef DEBUG
printk("atyfb(%s): calculated 0x%08X(%i)\n", __FUNCTION__, ret, ret); printk("atyfb(%s): calculated 0x%08X(%i)\n", __func__, ret, ret);
#endif #endif
return ret; return ret;
} }
...@@ -284,11 +284,11 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll) ...@@ -284,11 +284,11 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)
#ifdef DEBUG #ifdef DEBUG
printk("atyfb(%s): about to program:\n" printk("atyfb(%s): about to program:\n"
"pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n", "pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n",
__FUNCTION__, __func__,
pll->ct.pll_ext_cntl, pll->ct.pll_gen_cntl, pll->ct.pll_vclk_cntl); pll->ct.pll_ext_cntl, pll->ct.pll_gen_cntl, pll->ct.pll_vclk_cntl);
printk("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n", printk("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n",
__FUNCTION__, __func__,
par->clk_wr_offset, pll->ct.vclk_fb_div, par->clk_wr_offset, pll->ct.vclk_fb_div,
pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real); pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real);
#endif #endif
...@@ -428,7 +428,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, ...@@ -428,7 +428,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
#ifdef DEBUG #ifdef DEBUG
printk("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n", printk("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n",
__FUNCTION__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div); __func__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div);
#endif #endif
memcntl = aty_ld_le32(MEM_CNTL, par); memcntl = aty_ld_le32(MEM_CNTL, par);
...@@ -540,7 +540,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, ...@@ -540,7 +540,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) / pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) /
(par->ref_clk_per * pll->ct.pll_ref_div); (par->ref_clk_per * pll->ct.pll_ref_div);
printk("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n", printk("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n",
__FUNCTION__, pllmclk, pllmclk / pll->ct.xclk_post_div_real); __func__, pllmclk, pllmclk / pll->ct.xclk_post_div_real);
#endif #endif
if (M64_HAS(SDRAM_MAGIC_PLL) && (par->ram_type >= SDRAM)) if (M64_HAS(SDRAM_MAGIC_PLL) && (par->ram_type >= SDRAM))
...@@ -581,7 +581,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, ...@@ -581,7 +581,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
pllsclk = (1000000 * 2 * pll->ct.sclk_fb_div) / pllsclk = (1000000 * 2 * pll->ct.sclk_fb_div) /
(par->ref_clk_per * pll->ct.pll_ref_div); (par->ref_clk_per * pll->ct.pll_ref_div);
printk("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n", printk("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n",
__FUNCTION__, pllsclk, pllsclk / sclk_post_div_real); __func__, pllsclk, pllsclk / sclk_post_div_real);
#endif #endif
} }
......
drivers/video/bf54x-lq043fb.c
浏览文件 @ 5ae12170
...@@ -336,7 +336,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var, ...@@ -336,7 +336,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
{ {
if (var->bits_per_pixel != LCD_BPP) { if (var->bits_per_pixel != LCD_BPP) {
pr_debug("%s: depth not supported: %u BPP\n", __FUNCTION__, pr_debug("%s: depth not supported: %u BPP\n", __func__,
var->bits_per_pixel); var->bits_per_pixel);
return -EINVAL; return -EINVAL;
} }
...@@ -345,7 +345,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var, ...@@ -345,7 +345,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
info->var.xres_virtual != var->xres_virtual || info->var.xres_virtual != var->xres_virtual ||
info->var.yres_virtual != var->yres_virtual) { info->var.yres_virtual != var->yres_virtual) {
pr_debug("%s: Resolution not supported: X%u x Y%u \n", pr_debug("%s: Resolution not supported: X%u x Y%u \n",
__FUNCTION__, var->xres, var->yres); __func__, var->xres, var->yres);
return -EINVAL; return -EINVAL;
} }
...@@ -355,7 +355,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var, ...@@ -355,7 +355,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) { if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
pr_debug("%s: Memory Limit requested yres_virtual = %u\n", pr_debug("%s: Memory Limit requested yres_virtual = %u\n",
__FUNCTION__, var->yres_virtual); __func__, var->yres_virtual);
return -ENOMEM; return -ENOMEM;
} }
......
drivers/video/cfbimgblt.c
浏览文件 @ 5ae12170
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define DEBUG #define DEBUG
#ifdef DEBUG #ifdef DEBUG
#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args) #define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)
#else #else
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
......
drivers/video/cirrusfb.c
浏览文件 @ 5ae12170
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
/* debug output */ /* debug output */
#ifdef CIRRUSFB_DEBUG #ifdef CIRRUSFB_DEBUG
#define DPRINTK(fmt, args...) \ #define DPRINTK(fmt, args...) \
printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
#else #else
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#define assert(expr) \ #define assert(expr) \
if (!(expr)) { \ if (!(expr)) { \
printk("Assertion failed! %s,%s,%s,line=%d\n", \ printk("Assertion failed! %s,%s,%s,line=%d\n", \
#expr, __FILE__, __FUNCTION__, __LINE__); \ #expr, __FILE__, __func__, __LINE__); \
} }
#else #else
#define assert(expr) #define assert(expr)
......
drivers/video/console/fbcon.c
浏览文件 @ 5ae12170
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
#include "fbcon.h" #include "fbcon.h"
#ifdef FBCONDEBUG #ifdef FBCONDEBUG
# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
#else #else
# define DPRINTK(fmt, args...) # define DPRINTK(fmt, args...)
#endif #endif
......
drivers/video/imsttfb.c
浏览文件 @ 5ae12170
...@@ -1478,7 +1478,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1478,7 +1478,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dp = pci_device_to_OF_node(pdev); dp = pci_device_to_OF_node(pdev);
if(dp) if(dp)
printk(KERN_INFO "%s: OF name %s\n",__FUNCTION__, dp->name); printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
else else
printk(KERN_ERR "imsttfb: no OF node for pci device\n"); printk(KERN_ERR "imsttfb: no OF node for pci device\n");
#endif /* CONFIG_PPC_OF */ #endif /* CONFIG_PPC_OF */
......
drivers/video/imxfb.c
浏览文件 @ 5ae12170
...@@ -415,7 +415,7 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi) ...@@ -415,7 +415,7 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
static int imxfb_suspend(struct platform_device *dev, pm_message_t state) static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
{ {
struct imxfb_info *fbi = platform_get_drvdata(dev); struct imxfb_info *fbi = platform_get_drvdata(dev);
pr_debug("%s\n",__FUNCTION__); pr_debug("%s\n",__func__);
imxfb_disable_controller(fbi); imxfb_disable_controller(fbi);
return 0; return 0;
...@@ -424,7 +424,7 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state) ...@@ -424,7 +424,7 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
static int imxfb_resume(struct platform_device *dev) static int imxfb_resume(struct platform_device *dev)
{ {
struct imxfb_info *fbi = platform_get_drvdata(dev); struct imxfb_info *fbi = platform_get_drvdata(dev);
pr_debug("%s\n",__FUNCTION__); pr_debug("%s\n",__func__);
imxfb_enable_controller(fbi); imxfb_enable_controller(fbi);
return 0; return 0;
...@@ -440,7 +440,7 @@ static int __init imxfb_init_fbinfo(struct device *dev) ...@@ -440,7 +440,7 @@ static int __init imxfb_init_fbinfo(struct device *dev)
struct fb_info *info = dev_get_drvdata(dev); struct fb_info *info = dev_get_drvdata(dev);
struct imxfb_info *fbi = info->par; struct imxfb_info *fbi = info->par;
pr_debug("%s\n",__FUNCTION__); pr_debug("%s\n",__func__);
info->pseudo_palette = kmalloc( sizeof(u32) * 16, GFP_KERNEL); info->pseudo_palette = kmalloc( sizeof(u32) * 16, GFP_KERNEL);
if (!info->pseudo_palette) if (!info->pseudo_palette)
......
drivers/video/matrox/matroxfb_DAC1064.c
浏览文件 @ 5ae12170
...@@ -37,7 +37,7 @@ static void DAC1064_calcclock(CPMINFO unsigned int freq, unsigned int fmax, unsi ...@@ -37,7 +37,7 @@ static void DAC1064_calcclock(CPMINFO unsigned int freq, unsigned int fmax, unsi
unsigned int fvco; unsigned int fvco;
unsigned int p; unsigned int p;
DBG(__FUNCTION__) DBG(__func__)
/* only for devices older than G450 */ /* only for devices older than G450 */
...@@ -83,7 +83,7 @@ static const unsigned char MGA1064_DAC[] = { ...@@ -83,7 +83,7 @@ static const unsigned char MGA1064_DAC[] = {
static void DAC1064_setpclk(WPMINFO unsigned long fout) { static void DAC1064_setpclk(WPMINFO unsigned long fout) {
unsigned int m, n, p; unsigned int m, n, p;
DBG(__FUNCTION__) DBG(__func__)
DAC1064_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p); DAC1064_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
ACCESS_FBINFO(hw).DACclk[0] = m; ACCESS_FBINFO(hw).DACclk[0] = m;
...@@ -95,7 +95,7 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) { ...@@ -95,7 +95,7 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {
u_int32_t mx; u_int32_t mx;
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
if (ACCESS_FBINFO(devflags.noinit)) { if (ACCESS_FBINFO(devflags.noinit)) {
/* read MCLK and give up... */ /* read MCLK and give up... */
...@@ -338,7 +338,7 @@ void DAC1064_global_restore(WPMINFO2) { ...@@ -338,7 +338,7 @@ void DAC1064_global_restore(WPMINFO2) {
static int DAC1064_init_1(WPMINFO struct my_timming* m) { static int DAC1064_init_1(WPMINFO struct my_timming* m) {
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
memcpy(hw->DACreg, MGA1064_DAC, sizeof(MGA1064_DAC_regs)); memcpy(hw->DACreg, MGA1064_DAC, sizeof(MGA1064_DAC_regs));
switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) { switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
...@@ -374,7 +374,7 @@ static int DAC1064_init_1(WPMINFO struct my_timming* m) { ...@@ -374,7 +374,7 @@ static int DAC1064_init_1(WPMINFO struct my_timming* m) {
static int DAC1064_init_2(WPMINFO struct my_timming* m) { static int DAC1064_init_2(WPMINFO struct my_timming* m) {
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
if (ACCESS_FBINFO(fbcon).var.bits_per_pixel > 16) { /* 256 entries */ if (ACCESS_FBINFO(fbcon).var.bits_per_pixel > 16) { /* 256 entries */
int i; int i;
...@@ -418,7 +418,7 @@ static void DAC1064_restore_1(WPMINFO2) { ...@@ -418,7 +418,7 @@ static void DAC1064_restore_1(WPMINFO2) {
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
...@@ -448,7 +448,7 @@ static void DAC1064_restore_2(WPMINFO2) { ...@@ -448,7 +448,7 @@ static void DAC1064_restore_2(WPMINFO2) {
unsigned int i; unsigned int i;
#endif #endif
DBG(__FUNCTION__) DBG(__func__)
#ifdef DEBUG #ifdef DEBUG
dprintk(KERN_DEBUG "DAC1064regs "); dprintk(KERN_DEBUG "DAC1064regs ");
...@@ -521,7 +521,7 @@ static struct matrox_altout g450out = { ...@@ -521,7 +521,7 @@ static struct matrox_altout g450out = {
static int MGA1064_init(WPMINFO struct my_timming* m) { static int MGA1064_init(WPMINFO struct my_timming* m) {
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
if (DAC1064_init_1(PMINFO m)) return 1; if (DAC1064_init_1(PMINFO m)) return 1;
if (matroxfb_vgaHWinit(PMINFO m)) return 1; if (matroxfb_vgaHWinit(PMINFO m)) return 1;
...@@ -543,7 +543,7 @@ static int MGA1064_init(WPMINFO struct my_timming* m) { ...@@ -543,7 +543,7 @@ static int MGA1064_init(WPMINFO struct my_timming* m) {
static int MGAG100_init(WPMINFO struct my_timming* m) { static int MGAG100_init(WPMINFO struct my_timming* m) {
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
if (DAC1064_init_1(PMINFO m)) return 1; if (DAC1064_init_1(PMINFO m)) return 1;
hw->MXoptionReg &= ~0x2000; hw->MXoptionReg &= ~0x2000;
...@@ -565,7 +565,7 @@ static int MGAG100_init(WPMINFO struct my_timming* m) { ...@@ -565,7 +565,7 @@ static int MGAG100_init(WPMINFO struct my_timming* m) {
#ifdef CONFIG_FB_MATROX_MYSTIQUE #ifdef CONFIG_FB_MATROX_MYSTIQUE
static void MGA1064_ramdac_init(WPMINFO2) { static void MGA1064_ramdac_init(WPMINFO2) {
DBG(__FUNCTION__) DBG(__func__)
/* ACCESS_FBINFO(features.DAC1064.vco_freq_min) = 120000; */ /* ACCESS_FBINFO(features.DAC1064.vco_freq_min) = 120000; */
ACCESS_FBINFO(features.pll.vco_freq_min) = 62000; ACCESS_FBINFO(features.pll.vco_freq_min) = 62000;
...@@ -594,7 +594,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) { ...@@ -594,7 +594,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {
int selClk; int selClk;
int clk; int clk;
DBG(__FUNCTION__) DBG(__func__)
outDAC1064(PMINFO M1064_XPIXCLKCTRL, inDAC1064(PMINFO M1064_XPIXCLKCTRL) | M1064_XPIXCLKCTRL_DIS | outDAC1064(PMINFO M1064_XPIXCLKCTRL, inDAC1064(PMINFO M1064_XPIXCLKCTRL) | M1064_XPIXCLKCTRL_DIS |
M1064_XPIXCLKCTRL_PLL_UP); M1064_XPIXCLKCTRL_PLL_UP);
...@@ -636,7 +636,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) { ...@@ -636,7 +636,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {
static void MGAG100_setPixClock(CPMINFO int flags, int freq) { static void MGAG100_setPixClock(CPMINFO int flags, int freq) {
unsigned int m, n, p; unsigned int m, n, p;
DBG(__FUNCTION__) DBG(__func__)
DAC1064_calcclock(PMINFO freq, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p); DAC1064_calcclock(PMINFO freq, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
MGAG100_progPixClock(PMINFO flags, m, n, p); MGAG100_progPixClock(PMINFO flags, m, n, p);
...@@ -650,7 +650,7 @@ static int MGA1064_preinit(WPMINFO2) { ...@@ -650,7 +650,7 @@ static int MGA1064_preinit(WPMINFO2) {
2048, 0}; 2048, 0};
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
/* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */ /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
ACCESS_FBINFO(capable.text) = 1; ACCESS_FBINFO(capable.text) = 1;
...@@ -683,7 +683,7 @@ static int MGA1064_preinit(WPMINFO2) { ...@@ -683,7 +683,7 @@ static int MGA1064_preinit(WPMINFO2) {
static void MGA1064_reset(WPMINFO2) { static void MGA1064_reset(WPMINFO2) {
DBG(__FUNCTION__); DBG(__func__);
MGA1064_ramdac_init(PMINFO2); MGA1064_ramdac_init(PMINFO2);
} }
...@@ -819,7 +819,7 @@ static int MGAG100_preinit(WPMINFO2) { ...@@ -819,7 +819,7 @@ static int MGAG100_preinit(WPMINFO2) {
u_int32_t q; u_int32_t q;
#endif #endif
DBG(__FUNCTION__) DBG(__func__)
/* there are some instabilities if in_div > 19 && vco < 61000 */ /* there are some instabilities if in_div > 19 && vco < 61000 */
if (ACCESS_FBINFO(devflags.g450dac)) { if (ACCESS_FBINFO(devflags.g450dac)) {
...@@ -956,7 +956,7 @@ static void MGAG100_reset(WPMINFO2) { ...@@ -956,7 +956,7 @@ static void MGAG100_reset(WPMINFO2) {
u_int8_t b; u_int8_t b;
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
{ {
#ifdef G100_BROKEN_IBM_82351 #ifdef G100_BROKEN_IBM_82351
...@@ -1015,7 +1015,7 @@ static void MGA1064_restore(WPMINFO2) { ...@@ -1015,7 +1015,7 @@ static void MGA1064_restore(WPMINFO2) {
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
...@@ -1041,7 +1041,7 @@ static void MGAG100_restore(WPMINFO2) { ...@@ -1041,7 +1041,7 @@ static void MGAG100_restore(WPMINFO2) {
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
......
drivers/video/matrox/matroxfb_Ti3026.c
浏览文件 @ 5ae12170
...@@ -283,7 +283,7 @@ static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* i ...@@ -283,7 +283,7 @@ static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* i
unsigned int fvco; unsigned int fvco;
unsigned int lin, lfeed, lpost; unsigned int lin, lfeed, lpost;
DBG(__FUNCTION__) DBG(__func__)
fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost); fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost);
fvco >>= (*post = lpost); fvco >>= (*post = lpost);
...@@ -297,7 +297,7 @@ static int Ti3026_setpclk(WPMINFO int clk) { ...@@ -297,7 +297,7 @@ static int Ti3026_setpclk(WPMINFO int clk) {
unsigned int pixfeed, pixin, pixpost; unsigned int pixfeed, pixin, pixpost;
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost); f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost);
...@@ -365,7 +365,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) { ...@@ -365,7 +365,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {
u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT; u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT;
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg)); memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg));
switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) { switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
...@@ -440,7 +440,7 @@ static void ti3026_setMCLK(WPMINFO int fout){ ...@@ -440,7 +440,7 @@ static void ti3026_setMCLK(WPMINFO int fout){
unsigned int rfhcnt, mclk_ctl; unsigned int rfhcnt, mclk_ctl;
int tmout; int tmout;
DBG(__FUNCTION__) DBG(__func__)
f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p); f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p);
...@@ -534,7 +534,7 @@ static void ti3026_setMCLK(WPMINFO int fout){ ...@@ -534,7 +534,7 @@ static void ti3026_setMCLK(WPMINFO int fout){
static void ti3026_ramdac_init(WPMINFO2) { static void ti3026_ramdac_init(WPMINFO2) {
DBG(__FUNCTION__) DBG(__func__)
ACCESS_FBINFO(features.pll.vco_freq_min) = 110000; ACCESS_FBINFO(features.pll.vco_freq_min) = 110000;
ACCESS_FBINFO(features.pll.ref_freq) = 114545; ACCESS_FBINFO(features.pll.ref_freq) = 114545;
...@@ -554,7 +554,7 @@ static void Ti3026_restore(WPMINFO2) { ...@@ -554,7 +554,7 @@ static void Ti3026_restore(WPMINFO2) {
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
#ifdef DEBUG #ifdef DEBUG
dprintk(KERN_INFO "EXTVGA regs: "); dprintk(KERN_INFO "EXTVGA regs: ");
...@@ -662,7 +662,7 @@ static void Ti3026_restore(WPMINFO2) { ...@@ -662,7 +662,7 @@ static void Ti3026_restore(WPMINFO2) {
static void Ti3026_reset(WPMINFO2) { static void Ti3026_reset(WPMINFO2) {
DBG(__FUNCTION__) DBG(__func__)
ti3026_ramdac_init(PMINFO2); ti3026_ramdac_init(PMINFO2);
} }
...@@ -680,7 +680,7 @@ static int Ti3026_preinit(WPMINFO2) { ...@@ -680,7 +680,7 @@ static int Ti3026_preinit(WPMINFO2) {
2048, 0}; 2048, 0};
struct matrox_hw_state* hw = &ACCESS_FBINFO(hw); struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
ACCESS_FBINFO(millenium) = 1; ACCESS_FBINFO(millenium) = 1;
ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL); ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL);
......
drivers/video/matrox/matroxfb_accel.c
浏览文件 @ 5ae12170
...@@ -113,7 +113,7 @@ void matrox_cfbX_init(WPMINFO2) { ...@@ -113,7 +113,7 @@ void matrox_cfbX_init(WPMINFO2) {
u_int32_t mopmode; u_int32_t mopmode;
int accel; int accel;
DBG(__FUNCTION__) DBG(__func__)
mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual; mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual;
...@@ -199,7 +199,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx ...@@ -199,7 +199,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx
int start, end; int start, end;
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
...@@ -235,7 +235,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in ...@@ -235,7 +235,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in
int start, end; int start, end;
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
...@@ -287,7 +287,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he ...@@ -287,7 +287,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he
int width) { int width) {
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
...@@ -315,7 +315,7 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh ...@@ -315,7 +315,7 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh
int whattodo; int whattodo;
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
CRITBEGIN CRITBEGIN
...@@ -388,7 +388,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx, ...@@ -388,7 +388,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
int easy; int easy;
CRITFLAGS CRITFLAGS
DBG_HEAVY(__FUNCTION__); DBG_HEAVY(__func__);
step = (width + 7) >> 3; step = (width + 7) >> 3;
charcell = height * step; charcell = height * step;
...@@ -469,7 +469,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx, ...@@ -469,7 +469,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) { static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) {
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG_HEAVY(__FUNCTION__); DBG_HEAVY(__func__);
if (image->depth == 1) { if (image->depth == 1) {
u_int32_t fgx, bgx; u_int32_t fgx, bgx;
......
drivers/video/matrox/matroxfb_base.c
浏览文件 @ 5ae12170
...@@ -312,7 +312,7 @@ static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) { ...@@ -312,7 +312,7 @@ static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) {
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
if (ACCESS_FBINFO(dead)) if (ACCESS_FBINFO(dead))
return; return;
...@@ -392,7 +392,7 @@ static int matroxfb_open(struct fb_info *info, int user) ...@@ -392,7 +392,7 @@ static int matroxfb_open(struct fb_info *info, int user)
{ {
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG_LOOP(__FUNCTION__) DBG_LOOP(__func__)
if (ACCESS_FBINFO(dead)) { if (ACCESS_FBINFO(dead)) {
return -ENXIO; return -ENXIO;
...@@ -408,7 +408,7 @@ static int matroxfb_release(struct fb_info *info, int user) ...@@ -408,7 +408,7 @@ static int matroxfb_release(struct fb_info *info, int user)
{ {
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG_LOOP(__FUNCTION__) DBG_LOOP(__func__)
if (user) { if (user) {
if (0 == --ACCESS_FBINFO(userusecount)) { if (0 == --ACCESS_FBINFO(userusecount)) {
...@@ -425,7 +425,7 @@ static int matroxfb_pan_display(struct fb_var_screeninfo *var, ...@@ -425,7 +425,7 @@ static int matroxfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info* info) { struct fb_info* info) {
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG(__FUNCTION__) DBG(__func__)
matrox_pan_var(PMINFO var); matrox_pan_var(PMINFO var);
return 0; return 0;
...@@ -434,7 +434,7 @@ static int matroxfb_pan_display(struct fb_var_screeninfo *var, ...@@ -434,7 +434,7 @@ static int matroxfb_pan_display(struct fb_var_screeninfo *var,
static int matroxfb_get_final_bppShift(CPMINFO int bpp) { static int matroxfb_get_final_bppShift(CPMINFO int bpp) {
int bppshft2; int bppshft2;
DBG(__FUNCTION__) DBG(__func__)
bppshft2 = bpp; bppshft2 = bpp;
if (!bppshft2) { if (!bppshft2) {
...@@ -451,7 +451,7 @@ static int matroxfb_test_and_set_rounding(CPMINFO int xres, int bpp) { ...@@ -451,7 +451,7 @@ static int matroxfb_test_and_set_rounding(CPMINFO int xres, int bpp) {
int over; int over;
int rounding; int rounding;
DBG(__FUNCTION__) DBG(__func__)
switch (bpp) { switch (bpp) {
case 0: return xres; case 0: return xres;
...@@ -482,7 +482,7 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) { ...@@ -482,7 +482,7 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
const int* width; const int* width;
int xres_new; int xres_new;
DBG(__FUNCTION__) DBG(__func__)
if (!bpp) return xres; if (!bpp) return xres;
...@@ -504,7 +504,7 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) { ...@@ -504,7 +504,7 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
static int matroxfb_get_cmap_len(struct fb_var_screeninfo *var) { static int matroxfb_get_cmap_len(struct fb_var_screeninfo *var) {
DBG(__FUNCTION__) DBG(__func__)
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 4: case 4:
...@@ -548,7 +548,7 @@ static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visua ...@@ -548,7 +548,7 @@ static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visua
unsigned int vramlen; unsigned int vramlen;
unsigned int memlen; unsigned int memlen;
DBG(__FUNCTION__) DBG(__func__)
switch (bpp) { switch (bpp) {
case 4: if (!ACCESS_FBINFO(capable.cfb4)) return -EINVAL; case 4: if (!ACCESS_FBINFO(capable.cfb4)) return -EINVAL;
...@@ -648,7 +648,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -648,7 +648,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
struct matrox_fb_info* minfo = container_of(fb_info, struct matrox_fb_info, fbcon); struct matrox_fb_info* minfo = container_of(fb_info, struct matrox_fb_info, fbcon);
#endif #endif
DBG(__FUNCTION__) DBG(__func__)
/* /*
* Set a single color register. The values supplied are * Set a single color register. The values supplied are
...@@ -707,7 +707,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -707,7 +707,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
static void matroxfb_init_fix(WPMINFO2) static void matroxfb_init_fix(WPMINFO2)
{ {
struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix; struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix;
DBG(__FUNCTION__) DBG(__func__)
strcpy(fix->id,"MATROX"); strcpy(fix->id,"MATROX");
...@@ -722,7 +722,7 @@ static void matroxfb_init_fix(WPMINFO2) ...@@ -722,7 +722,7 @@ static void matroxfb_init_fix(WPMINFO2)
static void matroxfb_update_fix(WPMINFO2) static void matroxfb_update_fix(WPMINFO2)
{ {
struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix; struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix;
DBG(__FUNCTION__) DBG(__func__)
fix->smem_start = ACCESS_FBINFO(video.base) + ACCESS_FBINFO(curr.ydstorg.bytes); fix->smem_start = ACCESS_FBINFO(video.base) + ACCESS_FBINFO(curr.ydstorg.bytes);
fix->smem_len = ACCESS_FBINFO(video.len_usable) - ACCESS_FBINFO(curr.ydstorg.bytes); fix->smem_len = ACCESS_FBINFO(video.len_usable) - ACCESS_FBINFO(curr.ydstorg.bytes);
...@@ -753,7 +753,7 @@ static int matroxfb_set_par(struct fb_info *info) ...@@ -753,7 +753,7 @@ static int matroxfb_set_par(struct fb_info *info)
struct fb_var_screeninfo *var; struct fb_var_screeninfo *var;
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG(__FUNCTION__) DBG(__func__)
if (ACCESS_FBINFO(dead)) { if (ACCESS_FBINFO(dead)) {
return -ENXIO; return -ENXIO;
...@@ -876,7 +876,7 @@ static int matroxfb_ioctl(struct fb_info *info, ...@@ -876,7 +876,7 @@ static int matroxfb_ioctl(struct fb_info *info,
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG(__FUNCTION__) DBG(__func__)
if (ACCESS_FBINFO(dead)) { if (ACCESS_FBINFO(dead)) {
return -ENXIO; return -ENXIO;
...@@ -1175,7 +1175,7 @@ static int matroxfb_blank(int blank, struct fb_info *info) ...@@ -1175,7 +1175,7 @@ static int matroxfb_blank(int blank, struct fb_info *info)
CRITFLAGS CRITFLAGS
MINFO_FROM_INFO(info); MINFO_FROM_INFO(info);
DBG(__FUNCTION__) DBG(__func__)
if (ACCESS_FBINFO(dead)) if (ACCESS_FBINFO(dead))
return 1; return 1;
...@@ -1287,7 +1287,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi ...@@ -1287,7 +1287,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
unsigned char bytes[32]; unsigned char bytes[32];
unsigned char* tmp; unsigned char* tmp;
DBG(__FUNCTION__) DBG(__func__)
vm = ACCESS_FBINFO(video.vbase); vm = ACCESS_FBINFO(video.vbase);
maxSize &= ~0x1FFFFF; /* must be X*2MB (really it must be 2 or X*4MB) */ maxSize &= ~0x1FFFFF; /* must be X*2MB (really it must be 2 or X*4MB) */
...@@ -1593,7 +1593,7 @@ static int initMatrox2(WPMINFO struct board* b){ ...@@ -1593,7 +1593,7 @@ static int initMatrox2(WPMINFO struct board* b){
{ }, { },
}; };
DBG(__FUNCTION__) DBG(__func__)
/* set default values... */ /* set default values... */
vesafb_defined.accel_flags = FB_ACCELF_TEXT; vesafb_defined.accel_flags = FB_ACCELF_TEXT;
...@@ -2006,7 +2006,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm ...@@ -2006,7 +2006,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
#ifndef CONFIG_FB_MATROX_MULTIHEAD #ifndef CONFIG_FB_MATROX_MULTIHEAD
static int registered = 0; static int registered = 0;
#endif #endif
DBG(__FUNCTION__) DBG(__func__)
svid = pdev->subsystem_vendor; svid = pdev->subsystem_vendor;
sid = pdev->subsystem_device; sid = pdev->subsystem_device;
...@@ -2301,7 +2301,7 @@ static void __exit matrox_done(void) { ...@@ -2301,7 +2301,7 @@ static void __exit matrox_done(void) {
static int __init matroxfb_setup(char *options) { static int __init matroxfb_setup(char *options) {
char *this_opt; char *this_opt;
DBG(__FUNCTION__) DBG(__func__)
if (!options || !*options) if (!options || !*options)
return 0; return 0;
...@@ -2444,7 +2444,7 @@ static int __init matroxfb_init(void) ...@@ -2444,7 +2444,7 @@ static int __init matroxfb_init(void)
char *option = NULL; char *option = NULL;
int err = 0; int err = 0;
DBG(__FUNCTION__) DBG(__func__)
if (fb_get_options("matroxfb", &option)) if (fb_get_options("matroxfb", &option))
return -ENODEV; return -ENODEV;
...@@ -2556,7 +2556,7 @@ MODULE_PARM_DESC(cmode, "Specify the video depth that should be used (8bit defau ...@@ -2556,7 +2556,7 @@ MODULE_PARM_DESC(cmode, "Specify the video depth that should be used (8bit defau
int __init init_module(void){ int __init init_module(void){
DBG(__FUNCTION__) DBG(__func__)
if (disabled) if (disabled)
return -ENXIO; return -ENXIO;
......
drivers/video/matrox/matroxfb_crtc2.c
浏览文件 @ 5ae12170
...@@ -420,7 +420,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info, ...@@ -420,7 +420,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
#define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon)) #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
MINFO_FROM(m2info->primary_dev); MINFO_FROM(m2info->primary_dev);
DBG(__FUNCTION__) DBG(__func__)
switch (cmd) { switch (cmd) {
case FBIOGET_VBLANK: case FBIOGET_VBLANK:
......
drivers/video/matrox/matroxfb_maven.c
浏览文件 @ 5ae12170
...@@ -220,7 +220,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll, ...@@ -220,7 +220,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll,
unsigned int scrlen; unsigned int scrlen;
unsigned int fmax; unsigned int fmax;
DBG(__FUNCTION__) DBG(__func__)
scrlen = htotal * (vtotal - 1); scrlen = htotal * (vtotal - 1);
fwant = htotal * vtotal; fwant = htotal * vtotal;
......
drivers/video/matrox/matroxfb_misc.c
浏览文件 @ 5ae12170
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
#include <linux/matroxfb.h> #include <linux/matroxfb.h>
void matroxfb_DAC_out(CPMINFO int reg, int val) { void matroxfb_DAC_out(CPMINFO int reg, int val) {
DBG_REG(__FUNCTION__) DBG_REG(__func__)
mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg); mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);
mga_outb(M_RAMDAC_BASE+M_X_DATAREG, val); mga_outb(M_RAMDAC_BASE+M_X_DATAREG, val);
} }
int matroxfb_DAC_in(CPMINFO int reg) { int matroxfb_DAC_in(CPMINFO int reg) {
DBG_REG(__FUNCTION__) DBG_REG(__func__)
mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg); mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);
return mga_inb(M_RAMDAC_BASE+M_X_DATAREG); return mga_inb(M_RAMDAC_BASE+M_X_DATAREG);
} }
...@@ -104,7 +104,7 @@ int matroxfb_DAC_in(CPMINFO int reg) { ...@@ -104,7 +104,7 @@ int matroxfb_DAC_in(CPMINFO int reg) {
void matroxfb_var2my(struct fb_var_screeninfo* var, struct my_timming* mt) { void matroxfb_var2my(struct fb_var_screeninfo* var, struct my_timming* mt) {
unsigned int pixclock = var->pixclock; unsigned int pixclock = var->pixclock;
DBG(__FUNCTION__) DBG(__func__)
if (!pixclock) pixclock = 10000; /* 10ns = 100MHz */ if (!pixclock) pixclock = 10000; /* 10ns = 100MHz */
mt->pixclock = 1000000000 / pixclock; mt->pixclock = 1000000000 / pixclock;
...@@ -131,7 +131,7 @@ int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int f ...@@ -131,7 +131,7 @@ int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int f
unsigned int fwant; unsigned int fwant;
unsigned int p; unsigned int p;
DBG(__FUNCTION__) DBG(__func__)
fwant = freq; fwant = freq;
...@@ -192,7 +192,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) { ...@@ -192,7 +192,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
int i; int i;
struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw); struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
DBG(__FUNCTION__) DBG(__func__)
hw->SEQ[0] = 0x00; hw->SEQ[0] = 0x00;
hw->SEQ[1] = 0x01; /* or 0x09 */ hw->SEQ[1] = 0x01; /* or 0x09 */
...@@ -336,7 +336,7 @@ void matroxfb_vgaHWrestore(WPMINFO2) { ...@@ -336,7 +336,7 @@ void matroxfb_vgaHWrestore(WPMINFO2) {
struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw); struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
CRITFLAGS CRITFLAGS
DBG(__FUNCTION__) DBG(__func__)
dprintk(KERN_INFO "MiscOutReg: %02X\n", hw->MiscOutReg); dprintk(KERN_INFO "MiscOutReg: %02X\n", hw->MiscOutReg);
dprintk(KERN_INFO "SEQ regs: "); dprintk(KERN_INFO "SEQ regs: ");
......
drivers/video/modedb.c
浏览文件 @ 5ae12170
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
((v).xres == (x) && (v).yres == (y)) ((v).xres == (x) && (v).yres == (y))
#ifdef DEBUG #ifdef DEBUG
#define DPRINTK(fmt, args...) printk("modedb %s: " fmt, __FUNCTION__ , ## args) #define DPRINTK(fmt, args...) printk("modedb %s: " fmt, __func__ , ## args)
#else #else
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
......
drivers/video/nvidia/nvidia.c
浏览文件 @ 5ae12170
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
#define NVTRACE if (0) printk #define NVTRACE if (0) printk
#endif #endif
#define NVTRACE_ENTER(...) NVTRACE("%s START\n", __FUNCTION__) #define NVTRACE_ENTER(...) NVTRACE("%s START\n", __func__)
#define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __FUNCTION__) #define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __func__)
#ifdef CONFIG_FB_NVIDIA_DEBUG #ifdef CONFIG_FB_NVIDIA_DEBUG
#define assert(expr) \ #define assert(expr) \
if (!(expr)) { \ if (!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n",\ printk( "Assertion failed! %s,%s,%s,line=%d\n",\
#expr,__FILE__,__FUNCTION__,__LINE__); \ #expr,__FILE__,__func__,__LINE__); \
BUG(); \ BUG(); \
} }
#else #else
......
drivers/video/pm2fb.c
浏览文件 @ 5ae12170
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#undef PM2FB_MASTER_DEBUG #undef PM2FB_MASTER_DEBUG
#ifdef PM2FB_MASTER_DEBUG #ifdef PM2FB_MASTER_DEBUG
#define DPRINTK(a, b...) \ #define DPRINTK(a, b...) \
printk(KERN_DEBUG "pm2fb: %s: " a, __FUNCTION__ , ## b) printk(KERN_DEBUG "pm2fb: %s: " a, __func__ , ## b)
#else #else
#define DPRINTK(a, b...) #define DPRINTK(a, b...)
#endif #endif
......
drivers/video/pm3fb.c
浏览文件 @ 5ae12170
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#undef PM3FB_MASTER_DEBUG #undef PM3FB_MASTER_DEBUG
#ifdef PM3FB_MASTER_DEBUG #ifdef PM3FB_MASTER_DEBUG
#define DPRINTK(a, b...) \ #define DPRINTK(a, b...) \
printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b) printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
#else #else
#define DPRINTK(a, b...) #define DPRINTK(a, b...)
#endif #endif
......
drivers/video/riva/fbdev.c
浏览文件 @ 5ae12170
...@@ -70,14 +70,14 @@ ...@@ -70,14 +70,14 @@
#define NVTRACE if(0) printk #define NVTRACE if(0) printk
#endif #endif
#define NVTRACE_ENTER(...) NVTRACE("%s START\n", __FUNCTION__) #define NVTRACE_ENTER(...) NVTRACE("%s START\n", __func__)
#define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __FUNCTION__) #define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __func__)
#ifdef CONFIG_FB_RIVA_DEBUG #ifdef CONFIG_FB_RIVA_DEBUG
#define assert(expr) \ #define assert(expr) \
if(!(expr)) { \ if(!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n",\ printk( "Assertion failed! %s,%s,%s,line=%d\n",\
#expr,__FILE__,__FUNCTION__,__LINE__); \ #expr,__FILE__,__func__,__LINE__); \
BUG(); \ BUG(); \
} }
#else #else
......
drivers/video/s3c2410fb.c
浏览文件 @ 5ae12170
...@@ -430,9 +430,9 @@ static void s3c2410fb_activate_var(struct fb_info *info) ...@@ -430,9 +430,9 @@ static void s3c2410fb_activate_var(struct fb_info *info)
struct fb_var_screeninfo *var = &info->var; struct fb_var_screeninfo *var = &info->var;
int clkdiv = s3c2410fb_calc_pixclk(fbi, var->pixclock) / 2; int clkdiv = s3c2410fb_calc_pixclk(fbi, var->pixclock) / 2;
dprintk("%s: var->xres = %d\n", __FUNCTION__, var->xres); dprintk("%s: var->xres = %d\n", __func__, var->xres);
dprintk("%s: var->yres = %d\n", __FUNCTION__, var->yres); dprintk("%s: var->yres = %d\n", __func__, var->yres);
dprintk("%s: var->bpp = %d\n", __FUNCTION__, var->bits_per_pixel); dprintk("%s: var->bpp = %d\n", __func__, var->bits_per_pixel);
if (type == S3C2410_LCDCON1_TFT) { if (type == S3C2410_LCDCON1_TFT) {
s3c2410fb_calculate_tft_lcd_regs(info, &fbi->regs); s3c2410fb_calculate_tft_lcd_regs(info, &fbi->regs);
......
drivers/video/sa1100fb.h
浏览文件 @ 5ae12170
...@@ -132,7 +132,7 @@ struct sa1100fb_info { ...@@ -132,7 +132,7 @@ struct sa1100fb_info {
* Debug macros * Debug macros
*/ */
#if DEBUG #if DEBUG
# define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) # define DPRINTK(fmt, args...) printk("%s: " fmt, __func__ , ## args)
#else #else
# define DPRINTK(fmt, args...) # define DPRINTK(fmt, args...)
#endif #endif
......
drivers/video/sis/sis.h
浏览文件 @ 5ae12170
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#undef SISFBDEBUG #undef SISFBDEBUG
#ifdef SISFBDEBUG #ifdef SISFBDEBUG
#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) #define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
#define TWDEBUG(x) printk(KERN_INFO x "\n"); #define TWDEBUG(x) printk(KERN_INFO x "\n");
#else #else
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
......
drivers/video/sstfb.c
浏览文件 @ 5ae12170
...@@ -1006,7 +1006,7 @@ static int sst_set_pll_att_ti(struct fb_info *info, ...@@ -1006,7 +1006,7 @@ static int sst_set_pll_att_ti(struct fb_info *info,
break; break;
default: default:
dprintk("%s: wrong clock code '%d'\n", dprintk("%s: wrong clock code '%d'\n",
__FUNCTION__, clock); __func__, clock);
return 0; return 0;
} }
udelay(300); udelay(300);
...@@ -1048,7 +1048,7 @@ static int sst_set_pll_ics(struct fb_info *info, ...@@ -1048,7 +1048,7 @@ static int sst_set_pll_ics(struct fb_info *info,
break; break;
default: default:
dprintk("%s: wrong clock code '%d'\n", dprintk("%s: wrong clock code '%d'\n",
__FUNCTION__, clock); __func__, clock);
return 0; return 0;
} }
udelay(300); udelay(300);
...@@ -1079,7 +1079,7 @@ static void sst_set_vidmod_att_ti(struct fb_info *info, const int bpp) ...@@ -1079,7 +1079,7 @@ static void sst_set_vidmod_att_ti(struct fb_info *info, const int bpp)
sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_16BPP); sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_16BPP);
break; break;
default: default:
dprintk("%s: bad depth '%u'\n", __FUNCTION__, bpp); dprintk("%s: bad depth '%u'\n", __func__, bpp);
break; break;
} }
} }
...@@ -1093,7 +1093,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp) ...@@ -1093,7 +1093,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)
sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_16BPP); sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_16BPP);
break; break;
default: default:
dprintk("%s: bad depth '%u'\n", __FUNCTION__, bpp); dprintk("%s: bad depth '%u'\n", __func__, bpp);
break; break;
} }
} }
...@@ -1133,7 +1133,7 @@ static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par * ...@@ -1133,7 +1133,7 @@ static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *
} }
if (!ret) if (!ret)
return 0; return 0;
f_dprintk("%s found %s\n", __FUNCTION__, dacs[i].name); f_dprintk("%s found %s\n", __func__, dacs[i].name);
par->dac_sw = dacs[i]; par->dac_sw = dacs[i];
return 1; return 1;
} }
......
drivers/video/stifb.c
浏览文件 @ 5ae12170
...@@ -164,11 +164,11 @@ static int __initdata stifb_bpp_pref[MAX_STI_ROMS]; ...@@ -164,11 +164,11 @@ static int __initdata stifb_bpp_pref[MAX_STI_ROMS];
# define DEBUG_ON() debug_on=1 # define DEBUG_ON() debug_on=1
# define WRITE_BYTE(value,fb,reg) do { if (debug_on) \ # define WRITE_BYTE(value,fb,reg) do { if (debug_on) \
printk(KERN_DEBUG "%30s: WRITE_BYTE(0x%06x) = 0x%02x (old=0x%02x)\n", \ printk(KERN_DEBUG "%30s: WRITE_BYTE(0x%06x) = 0x%02x (old=0x%02x)\n", \
__FUNCTION__, reg, value, READ_BYTE(fb,reg)); \ __func__, reg, value, READ_BYTE(fb,reg)); \
gsc_writeb((value),(fb)->info.fix.mmio_start + (reg)); } while (0) gsc_writeb((value),(fb)->info.fix.mmio_start + (reg)); } while (0)
# define WRITE_WORD(value,fb,reg) do { if (debug_on) \ # define WRITE_WORD(value,fb,reg) do { if (debug_on) \
printk(KERN_DEBUG "%30s: WRITE_WORD(0x%06x) = 0x%08x (old=0x%08x)\n", \ printk(KERN_DEBUG "%30s: WRITE_WORD(0x%06x) = 0x%08x (old=0x%08x)\n", \
__FUNCTION__, reg, value, READ_WORD(fb,reg)); \ __func__, reg, value, READ_WORD(fb,reg)); \
gsc_writel((value),(fb)->info.fix.mmio_start + (reg)); } while (0) gsc_writel((value),(fb)->info.fix.mmio_start + (reg)); } while (0)
#endif /* DEBUG_STIFB_REGS */ #endif /* DEBUG_STIFB_REGS */
......
drivers/video/sysimgblt.c
浏览文件 @ 5ae12170
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define DEBUG #define DEBUG
#ifdef DEBUG #ifdef DEBUG
#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args) #define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)
#else #else
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
......
drivers/video/tdfxfb.c
浏览文件 @ 5ae12170
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#include <video/tdfx.h> #include <video/tdfx.h>
#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __FUNCTION__ , ## b) #define DPRINTK(a, b...) pr_debug("fb: %s: " a, __func__ , ## b)
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
#include <asm/mtrr.h> #include <asm/mtrr.h>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或