aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/lgdt330x.c
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
commit271ddbf702c3a4e6b18f6464180eda0f62efd9a5 (patch)
tree37a384a4ce6216c694ee0d86ffc89d4aa56944e1 /drivers/media/dvb/frontends/lgdt330x.c
parent708bebdd3922c6f346b8540f93c73f006d2b947b (diff)
V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/lgdt330x.c')
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index dc897a3903fc..f0195c8272f4 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -88,7 +88,7 @@ static int i2c_write_demod_bytes (struct lgdt330x_state* state,
88 88
89 for (i=0; i<len-1; i+=2){ 89 for (i=0; i<len-1; i+=2){
90 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { 90 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
91 printk(KERN_WARNING "lgdt330x: %s error (addr %02x <- %02x, err = %i)\n", __FUNCTION__, msg.buf[0], msg.buf[1], err); 91 printk(KERN_WARNING "lgdt330x: %s error (addr %02x <- %02x, err = %i)\n", __func__, msg.buf[0], msg.buf[1], err);
92 if (err < 0) 92 if (err < 0)
93 return err; 93 return err;
94 else 94 else
@@ -117,7 +117,7 @@ static u8 i2c_read_demod_bytes (struct lgdt330x_state* state,
117 int ret; 117 int ret;
118 ret = i2c_transfer(state->i2c, msg, 2); 118 ret = i2c_transfer(state->i2c, msg, 2);
119 if (ret != 2) { 119 if (ret != 2) {
120 printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __FUNCTION__, state->config->demod_address, reg, ret); 120 printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __func__, state->config->demod_address, reg, ret);
121 } else { 121 } else {
122 ret = 0; 122 ret = 0;
123 } 123 }
@@ -256,7 +256,7 @@ static int lgdt330x_init(struct dvb_frontend* fe)
256 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n"); 256 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n");
257 err = -ENODEV; 257 err = -ENODEV;
258 } 258 }
259 dprintk("%s entered as %s\n", __FUNCTION__, chip_name); 259 dprintk("%s entered as %s\n", __func__, chip_name);
260 if (err < 0) 260 if (err < 0)
261 return err; 261 return err;
262 return lgdt330x_SwReset(state); 262 return lgdt330x_SwReset(state);
@@ -334,7 +334,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
334 if (state->current_modulation != param->u.vsb.modulation) { 334 if (state->current_modulation != param->u.vsb.modulation) {
335 switch(param->u.vsb.modulation) { 335 switch(param->u.vsb.modulation) {
336 case VSB_8: 336 case VSB_8:
337 dprintk("%s: VSB_8 MODE\n", __FUNCTION__); 337 dprintk("%s: VSB_8 MODE\n", __func__);
338 338
339 /* Select VSB mode */ 339 /* Select VSB mode */
340 top_ctrl_cfg[1] = 0x03; 340 top_ctrl_cfg[1] = 0x03;
@@ -350,7 +350,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
350 break; 350 break;
351 351
352 case QAM_64: 352 case QAM_64:
353 dprintk("%s: QAM_64 MODE\n", __FUNCTION__); 353 dprintk("%s: QAM_64 MODE\n", __func__);
354 354
355 /* Select QAM_64 mode */ 355 /* Select QAM_64 mode */
356 top_ctrl_cfg[1] = 0x00; 356 top_ctrl_cfg[1] = 0x00;
@@ -366,7 +366,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
366 break; 366 break;
367 367
368 case QAM_256: 368 case QAM_256:
369 dprintk("%s: QAM_256 MODE\n", __FUNCTION__); 369 dprintk("%s: QAM_256 MODE\n", __func__);
370 370
371 /* Select QAM_256 mode */ 371 /* Select QAM_256 mode */
372 top_ctrl_cfg[1] = 0x01; 372 top_ctrl_cfg[1] = 0x01;
@@ -381,7 +381,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
381 } 381 }
382 break; 382 break;
383 default: 383 default:
384 printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __FUNCTION__, param->u.vsb.modulation); 384 printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __func__, param->u.vsb.modulation);
385 return -1; 385 return -1;
386 } 386 }
387 /* 387 /*
@@ -431,7 +431,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
431 431
432 /* AGC status register */ 432 /* AGC status register */
433 i2c_read_demod_bytes(state, AGC_STATUS, buf, 1); 433 i2c_read_demod_bytes(state, AGC_STATUS, buf, 1);
434 dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]); 434 dprintk("%s: AGC_STATUS = 0x%02x\n", __func__, buf[0]);
435 if ((buf[0] & 0x0c) == 0x8){ 435 if ((buf[0] & 0x0c) == 0x8){
436 /* Test signal does not exist flag */ 436 /* Test signal does not exist flag */
437 /* as well as the AGC lock flag. */ 437 /* as well as the AGC lock flag. */
@@ -445,7 +445,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
445 */ 445 */
446 /* signal status */ 446 /* signal status */
447 i2c_read_demod_bytes(state, TOP_CONTROL, buf, sizeof(buf)); 447 i2c_read_demod_bytes(state, TOP_CONTROL, buf, sizeof(buf));
448 dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __FUNCTION__, buf[0], buf[1], buf[2]); 448 dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __func__, buf[0], buf[1], buf[2]);
449 449
450 450
451 /* sync status */ 451 /* sync status */
@@ -461,7 +461,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
461 461
462 /* Carrier Recovery Lock Status Register */ 462 /* Carrier Recovery Lock Status Register */
463 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); 463 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
464 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]); 464 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __func__, buf[0]);
465 switch (state->current_modulation) { 465 switch (state->current_modulation) {
466 case QAM_256: 466 case QAM_256:
467 case QAM_64: 467 case QAM_64:
@@ -474,7 +474,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
474 *status |= FE_HAS_CARRIER; 474 *status |= FE_HAS_CARRIER;
475 break; 475 break;
476 default: 476 default:
477 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __FUNCTION__); 477 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __func__);
478 } 478 }
479 479
480 return 0; 480 return 0;
@@ -493,7 +493,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
493 if (err < 0) 493 if (err < 0)
494 return err; 494 return err;
495 495
496 dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]); 496 dprintk("%s: AGC_STATUS = 0x%02x\n", __func__, buf[0]);
497 if ((buf[0] & 0x21) == 0x01){ 497 if ((buf[0] & 0x21) == 0x01){
498 /* Test input signal does not exist flag */ 498 /* Test input signal does not exist flag */
499 /* as well as the AGC lock flag. */ 499 /* as well as the AGC lock flag. */
@@ -502,7 +502,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
502 502
503 /* Carrier Recovery Lock Status Register */ 503 /* Carrier Recovery Lock Status Register */
504 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); 504 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
505 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]); 505 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __func__, buf[0]);
506 switch (state->current_modulation) { 506 switch (state->current_modulation) {
507 case QAM_256: 507 case QAM_256:
508 case QAM_64: 508 case QAM_64:
@@ -533,7 +533,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
533 } 533 }
534 break; 534 break;
535 default: 535 default:
536 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __FUNCTION__); 536 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __func__);
537 } 537 }
538 return 0; 538 return 0;
539} 539}
@@ -607,14 +607,14 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
607 break; 607 break;
608 default: 608 default:
609 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n", 609 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n",
610 __FUNCTION__); 610 __func__);
611 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */ 611 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */
612 } 612 }
613 613
614 state->snr = calculate_snr(noise, c); 614 state->snr = calculate_snr(noise, c);
615 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */ 615 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */
616 616
617 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, 617 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
618 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); 618 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
619 619
620 return 0; 620 return 0;
@@ -651,14 +651,14 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr)
651 break; 651 break;
652 default: 652 default:
653 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n", 653 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n",
654 __FUNCTION__); 654 __func__);
655 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */ 655 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */
656 } 656 }
657 657
658 state->snr = calculate_snr(noise, c); 658 state->snr = calculate_snr(noise, c);
659 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */ 659 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */
660 660
661 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, 661 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
662 state->snr >> 24, (((state->snr >> 8) & 0xffff) * 100) >> 16); 662 state->snr >> 24, (((state->snr >> 8) & 0xffff) * 100) >> 16);
663 663
664 return 0; 664 return 0;
@@ -743,7 +743,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
743 743
744error: 744error:
745 kfree(state); 745 kfree(state);
746 dprintk("%s: ERROR\n",__FUNCTION__); 746 dprintk("%s: ERROR\n",__func__);
747 return NULL; 747 return NULL;
748} 748}
749 749