tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (7510): media/dvb/bt8xx replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by

Harvey Harrison and committed by
Mauro Carvalho Chehab b2e62e7c 7bca4498

+7 -7
+1 -1
drivers/media/dvb/bt8xx/dst.c
··· 1290 1290 { 1291 1291 int retval; 1292 1292 u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb }; 1293 - //dprintk("%s: Getting Signal strength and other parameters\n", __FUNCTION__); 1293 + //dprintk("%s: Getting Signal strength and other parameters\n", __func__); 1294 1294 if ((state->diseq_flags & ATTEMPT_TUNE) == 0) { 1295 1295 state->decode_lock = state->decode_strength = state->decode_snr = 0; 1296 1296 return 0;
+5 -5
drivers/media/dvb/bt8xx/dst_ca.c
··· 36 36 #define dprintk(x, y, z, format, arg...) do { \ 37 37 if (z) { \ 38 38 if ((x > DST_CA_ERROR) && (x > y)) \ 39 - printk(KERN_ERR "%s: " format "\n", __FUNCTION__ , ##arg); \ 39 + printk(KERN_ERR "%s: " format "\n", __func__ , ##arg); \ 40 40 else if ((x > DST_CA_NOTICE) && (x > y)) \ 41 - printk(KERN_NOTICE "%s: " format "\n", __FUNCTION__ , ##arg); \ 41 + printk(KERN_NOTICE "%s: " format "\n", __func__ , ##arg); \ 42 42 else if ((x > DST_CA_INFO) && (x > y)) \ 43 - printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##arg); \ 43 + printk(KERN_INFO "%s: " format "\n", __func__ , ##arg); \ 44 44 else if ((x > DST_CA_DEBUG) && (x > y)) \ 45 - printk(KERN_DEBUG "%s: " format "\n", __FUNCTION__ , ##arg); \ 45 + printk(KERN_DEBUG "%s: " format "\n", __func__ , ##arg); \ 46 46 } else { \ 47 47 if (x > y) \ 48 48 printk(format, ## arg); \ ··· 162 162 dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================"); 163 163 dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]", 164 164 state->messages[7], (state->messages[8] << 8) | state->messages[9], 165 - (state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12])); 165 + (state->messages[10] << 8) | state->messages[11], __func__, (char *)(&state->messages[12])); 166 166 dprintk(verbose, DST_CA_INFO, 1, " =================================================================================================="); 167 167 168 168 // Transform dst message to correct application_info message
+1 -1
drivers/media/dvb/bt8xx/dvb-bt8xx.c
··· 671 671 state->dst_ca = NULL; 672 672 /* DST is not a frontend, attaching the ASIC */ 673 673 if (dvb_attach(dst_attach, state, &card->dvb_adapter) == NULL) { 674 - printk("%s: Could not find a Twinhan DST.\n", __FUNCTION__); 674 + printk("%s: Could not find a Twinhan DST.\n", __func__); 675 675 break; 676 676 } 677 677 /* Attach other DST peripherals if any */