aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/bt8xx
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-08 22:20:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:58 -0400
commitb2e62e7cdb8022087ae2def06f8023c9f5d3b411 (patch)
tree28b8f07e0f4c42050cc878cfa60ccbb987ca4d0e /drivers/media/dvb/bt8xx
parent7bca4498f6ec331c2ace79824da8687ad35cd65c (diff)
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>
Diffstat (limited to 'drivers/media/dvb/bt8xx')
-rw-r--r--drivers/media/dvb/bt8xx/dst.c2
-rw-r--r--drivers/media/dvb/bt8xx/dst_ca.c10
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 307ff35bdf13..75711bde23ad 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1290,7 +1290,7 @@ static int dst_get_signal(struct dst_state *state)
1290{ 1290{
1291 int retval; 1291 int retval;
1292 u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb }; 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 if ((state->diseq_flags & ATTEMPT_TUNE) == 0) { 1294 if ((state->diseq_flags & ATTEMPT_TUNE) == 0) {
1295 state->decode_lock = state->decode_strength = state->decode_snr = 0; 1295 state->decode_lock = state->decode_strength = state->decode_snr = 0;
1296 return 0; 1296 return 0;
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 50bc32a8bd55..0258451423ad 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -36,13 +36,13 @@
36#define dprintk(x, y, z, format, arg...) do { \ 36#define dprintk(x, y, z, format, arg...) do { \
37 if (z) { \ 37 if (z) { \
38 if ((x > DST_CA_ERROR) && (x > y)) \ 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 else if ((x > DST_CA_NOTICE) && (x > y)) \ 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 else if ((x > DST_CA_INFO) && (x > y)) \ 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 else if ((x > DST_CA_DEBUG) && (x > y)) \ 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 } else { \ 46 } else { \
47 if (x > y) \ 47 if (x > y) \
48 printk(format, ## arg); \ 48 printk(format, ## arg); \
@@ -162,7 +162,7 @@ static int ca_get_app_info(struct dst_state *state)
162 dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================"); 162 dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================");
163 dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]", 163 dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]",
164 state->messages[7], (state->messages[8] << 8) | state->messages[9], 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 dprintk(verbose, DST_CA_INFO, 1, " =================================================================================================="); 166 dprintk(verbose, DST_CA_INFO, 1, " ==================================================================================================");
167 167
168 // Transform dst message to correct application_info message 168 // Transform dst message to correct application_info message
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 65081f161544..a39439b5f04c 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -671,7 +671,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
671 state->dst_ca = NULL; 671 state->dst_ca = NULL;
672 /* DST is not a frontend, attaching the ASIC */ 672 /* DST is not a frontend, attaching the ASIC */
673 if (dvb_attach(dst_attach, state, &card->dvb_adapter) == NULL) { 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 break; 675 break;
676 } 676 }
677 /* Attach other DST peripherals if any */ 677 /* Attach other DST peripherals if any */