Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ae12170 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

video: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7a05aa9

drivers/video/amifb.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
#endif



#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

#  define DPRINTK(fmt, args...)

#endif

drivers/video/aty/aty128fb.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#undef 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

#define DBG(fmt, args...)

#endif

drivers/video/aty/mach64_ct.c

+8 −8
Original line number Diff line number Diff line
@@ -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;

#ifdef DEBUG

	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

	return 0;

}
@@ -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);

#ifdef DEBUG

	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

	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 
	}

#endif

#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

	return ret;

}
@@ -284,11 +284,11 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll) 
#ifdef DEBUG

	printk("atyfb(%s): about to program:\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);



	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,

		pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real);

#endif
@@ -428,7 +428,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info, 


#ifdef DEBUG

	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



	memcntl = aty_ld_le32(MEM_CNTL, par);
@@ -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) /

			(par->ref_clk_per * pll->ct.pll_ref_div);

	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



	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, 
		pllsclk = (1000000 * 2 * pll->ct.sclk_fb_div) /

			(par->ref_clk_per * pll->ct.pll_ref_div);

		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

	}

drivers/video/bf54x-lq043fb.c

+3 −3
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var, 
{



	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);

		return -EINVAL;

	}
@@ -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.yres_virtual != var->yres_virtual) {

		pr_debug("%s: Resolution not supported: X%u x Y%u \n",

			 __FUNCTION__, var->xres, var->yres);

			 __func__, var->xres, var->yres);

		return -EINVAL;

	}
@@ -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) {

		pr_debug("%s: Memory Limit requested yres_virtual = %u\n",

			 __FUNCTION__, var->yres_virtual);

			 __func__, var->yres_virtual);

		return -ENOMEM;

	}

drivers/video/cfbimgblt.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define 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

#define DPRINTK(fmt, args...)

#endif