diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-08 22:20:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:58 -0400 |
commit | 271ddbf702c3a4e6b18f6464180eda0f62efd9a5 (patch) | |
tree | 37a384a4ce6216c694ee0d86ffc89d4aa56944e1 /drivers/media/dvb/frontends/xc5000.c | |
parent | 708bebdd3922c6f346b8540f93c73f006d2b947b (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/xc5000.c')
-rw-r--r-- | drivers/media/dvb/frontends/xc5000.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/media/dvb/frontends/xc5000.c b/drivers/media/dvb/frontends/xc5000.c index a5094b7f21fd..43d35bdb221f 100644 --- a/drivers/media/dvb/frontends/xc5000.c +++ b/drivers/media/dvb/frontends/xc5000.c | |||
@@ -209,7 +209,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe) | |||
209 | struct xc5000_priv *priv = fe->tuner_priv; | 209 | struct xc5000_priv *priv = fe->tuner_priv; |
210 | int ret; | 210 | int ret; |
211 | 211 | ||
212 | dprintk(1, "%s()\n", __FUNCTION__); | 212 | dprintk(1, "%s()\n", __func__); |
213 | 213 | ||
214 | if (priv->cfg->tuner_callback) { | 214 | if (priv->cfg->tuner_callback) { |
215 | ret = priv->cfg->tuner_callback(priv->cfg->priv, | 215 | ret = priv->cfg->tuner_callback(priv->cfg->priv, |
@@ -330,7 +330,7 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, u8 i2c_sequence[]) | |||
330 | 330 | ||
331 | static int xc_initialize(struct xc5000_priv *priv) | 331 | static int xc_initialize(struct xc5000_priv *priv) |
332 | { | 332 | { |
333 | dprintk(1, "%s()\n", __FUNCTION__); | 333 | dprintk(1, "%s()\n", __func__); |
334 | return xc_write_reg(priv, XREG_INIT, 0); | 334 | return xc_write_reg(priv, XREG_INIT, 0); |
335 | } | 335 | } |
336 | 336 | ||
@@ -338,9 +338,9 @@ static int xc_SetTVStandard(struct xc5000_priv *priv, | |||
338 | u16 VideoMode, u16 AudioMode) | 338 | u16 VideoMode, u16 AudioMode) |
339 | { | 339 | { |
340 | int ret; | 340 | int ret; |
341 | dprintk(1, "%s(0x%04x,0x%04x)\n", __FUNCTION__, VideoMode, AudioMode); | 341 | dprintk(1, "%s(0x%04x,0x%04x)\n", __func__, VideoMode, AudioMode); |
342 | dprintk(1, "%s() Standard = %s\n", | 342 | dprintk(1, "%s() Standard = %s\n", |
343 | __FUNCTION__, | 343 | __func__, |
344 | XC5000_Standard[priv->video_standard].Name); | 344 | XC5000_Standard[priv->video_standard].Name); |
345 | 345 | ||
346 | ret = xc_write_reg(priv, XREG_VIDEO_MODE, VideoMode); | 346 | ret = xc_write_reg(priv, XREG_VIDEO_MODE, VideoMode); |
@@ -361,7 +361,7 @@ static int xc_shutdown(struct xc5000_priv *priv) | |||
361 | 361 | ||
362 | static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode) | 362 | static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode) |
363 | { | 363 | { |
364 | dprintk(1, "%s(%d) Source = %s\n", __FUNCTION__, rf_mode, | 364 | dprintk(1, "%s(%d) Source = %s\n", __func__, rf_mode, |
365 | rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE"); | 365 | rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE"); |
366 | 366 | ||
367 | if ((rf_mode != XC_RF_MODE_AIR) && (rf_mode != XC_RF_MODE_CABLE)) | 367 | if ((rf_mode != XC_RF_MODE_AIR) && (rf_mode != XC_RF_MODE_CABLE)) |
@@ -369,7 +369,7 @@ static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode) | |||
369 | rf_mode = XC_RF_MODE_CABLE; | 369 | rf_mode = XC_RF_MODE_CABLE; |
370 | printk(KERN_ERR | 370 | printk(KERN_ERR |
371 | "%s(), Invalid mode, defaulting to CABLE", | 371 | "%s(), Invalid mode, defaulting to CABLE", |
372 | __FUNCTION__); | 372 | __func__); |
373 | } | 373 | } |
374 | return xc_write_reg(priv, XREG_SIGNALSOURCE, rf_mode); | 374 | return xc_write_reg(priv, XREG_SIGNALSOURCE, rf_mode); |
375 | } | 375 | } |
@@ -380,7 +380,7 @@ static int xc_set_RF_frequency(struct xc5000_priv *priv, u32 freq_hz) | |||
380 | { | 380 | { |
381 | u16 freq_code; | 381 | u16 freq_code; |
382 | 382 | ||
383 | dprintk(1, "%s(%u)\n", __FUNCTION__, freq_hz); | 383 | dprintk(1, "%s(%u)\n", __func__, freq_hz); |
384 | 384 | ||
385 | if ((freq_hz > xc5000_tuner_ops.info.frequency_max) || | 385 | if ((freq_hz > xc5000_tuner_ops.info.frequency_max) || |
386 | (freq_hz < xc5000_tuner_ops.info.frequency_min)) | 386 | (freq_hz < xc5000_tuner_ops.info.frequency_min)) |
@@ -396,7 +396,7 @@ static int xc_set_IF_frequency(struct xc5000_priv *priv, u32 freq_khz) | |||
396 | { | 396 | { |
397 | u32 freq_code = (freq_khz * 1024)/1000; | 397 | u32 freq_code = (freq_khz * 1024)/1000; |
398 | dprintk(1, "%s(freq_khz = %d) freq_code = 0x%x\n", | 398 | dprintk(1, "%s(freq_khz = %d) freq_code = 0x%x\n", |
399 | __FUNCTION__, freq_khz, freq_code); | 399 | __func__, freq_khz, freq_code); |
400 | 400 | ||
401 | return xc_write_reg(priv, XREG_IF_OUT, freq_code); | 401 | return xc_write_reg(priv, XREG_IF_OUT, freq_code); |
402 | } | 402 | } |
@@ -488,7 +488,7 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz) | |||
488 | { | 488 | { |
489 | int found = 0; | 489 | int found = 0; |
490 | 490 | ||
491 | dprintk(1, "%s(%u)\n", __FUNCTION__, freq_hz); | 491 | dprintk(1, "%s(%u)\n", __func__, freq_hz); |
492 | 492 | ||
493 | if (xc_set_RF_frequency(priv, freq_hz) != XC_RESULT_SUCCESS) | 493 | if (xc_set_RF_frequency(priv, freq_hz) != XC_RESULT_SUCCESS) |
494 | return 0; | 494 | return 0; |
@@ -627,12 +627,12 @@ static int xc5000_set_params(struct dvb_frontend *fe, | |||
627 | struct xc5000_priv *priv = fe->tuner_priv; | 627 | struct xc5000_priv *priv = fe->tuner_priv; |
628 | int ret; | 628 | int ret; |
629 | 629 | ||
630 | dprintk(1, "%s() frequency=%d (Hz)\n", __FUNCTION__, params->frequency); | 630 | dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency); |
631 | 631 | ||
632 | switch(params->u.vsb.modulation) { | 632 | switch(params->u.vsb.modulation) { |
633 | case VSB_8: | 633 | case VSB_8: |
634 | case VSB_16: | 634 | case VSB_16: |
635 | dprintk(1, "%s() VSB modulation\n", __FUNCTION__); | 635 | dprintk(1, "%s() VSB modulation\n", __func__); |
636 | priv->rf_mode = XC_RF_MODE_AIR; | 636 | priv->rf_mode = XC_RF_MODE_AIR; |
637 | priv->freq_hz = params->frequency - 1750000; | 637 | priv->freq_hz = params->frequency - 1750000; |
638 | priv->bandwidth = BANDWIDTH_6_MHZ; | 638 | priv->bandwidth = BANDWIDTH_6_MHZ; |
@@ -641,7 +641,7 @@ static int xc5000_set_params(struct dvb_frontend *fe, | |||
641 | case QAM_64: | 641 | case QAM_64: |
642 | case QAM_256: | 642 | case QAM_256: |
643 | case QAM_AUTO: | 643 | case QAM_AUTO: |
644 | dprintk(1, "%s() QAM modulation\n", __FUNCTION__); | 644 | dprintk(1, "%s() QAM modulation\n", __func__); |
645 | priv->rf_mode = XC_RF_MODE_CABLE; | 645 | priv->rf_mode = XC_RF_MODE_CABLE; |
646 | priv->freq_hz = params->frequency - 1750000; | 646 | priv->freq_hz = params->frequency - 1750000; |
647 | priv->bandwidth = BANDWIDTH_6_MHZ; | 647 | priv->bandwidth = BANDWIDTH_6_MHZ; |
@@ -652,7 +652,7 @@ static int xc5000_set_params(struct dvb_frontend *fe, | |||
652 | } | 652 | } |
653 | 653 | ||
654 | dprintk(1, "%s() frequency=%d (compensated)\n", | 654 | dprintk(1, "%s() frequency=%d (compensated)\n", |
655 | __FUNCTION__, priv->freq_hz); | 655 | __func__, priv->freq_hz); |
656 | 656 | ||
657 | ret = xc_SetSignalSource(priv, priv->rf_mode); | 657 | ret = xc_SetSignalSource(priv, priv->rf_mode); |
658 | if (ret != XC_RESULT_SUCCESS) { | 658 | if (ret != XC_RESULT_SUCCESS) { |
@@ -697,7 +697,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe, | |||
697 | xc_load_fw_and_init_tuner(fe); | 697 | xc_load_fw_and_init_tuner(fe); |
698 | 698 | ||
699 | dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n", | 699 | dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n", |
700 | __FUNCTION__, params->frequency); | 700 | __func__, params->frequency); |
701 | 701 | ||
702 | priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */ | 702 | priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */ |
703 | 703 | ||
@@ -775,7 +775,7 @@ tune_channel: | |||
775 | static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) | 775 | static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) |
776 | { | 776 | { |
777 | struct xc5000_priv *priv = fe->tuner_priv; | 777 | struct xc5000_priv *priv = fe->tuner_priv; |
778 | dprintk(1, "%s()\n", __FUNCTION__); | 778 | dprintk(1, "%s()\n", __func__); |
779 | *freq = priv->freq_hz; | 779 | *freq = priv->freq_hz; |
780 | return 0; | 780 | return 0; |
781 | } | 781 | } |
@@ -783,7 +783,7 @@ static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) | |||
783 | static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw) | 783 | static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw) |
784 | { | 784 | { |
785 | struct xc5000_priv *priv = fe->tuner_priv; | 785 | struct xc5000_priv *priv = fe->tuner_priv; |
786 | dprintk(1, "%s()\n", __FUNCTION__); | 786 | dprintk(1, "%s()\n", __func__); |
787 | 787 | ||
788 | *bw = priv->bandwidth; | 788 | *bw = priv->bandwidth; |
789 | return 0; | 789 | return 0; |
@@ -796,7 +796,7 @@ static int xc5000_get_status(struct dvb_frontend *fe, u32 *status) | |||
796 | 796 | ||
797 | xc_get_lock_status(priv, &lock_status); | 797 | xc_get_lock_status(priv, &lock_status); |
798 | 798 | ||
799 | dprintk(1, "%s() lock_status = 0x%08x\n", __FUNCTION__, lock_status); | 799 | dprintk(1, "%s() lock_status = 0x%08x\n", __func__, lock_status); |
800 | 800 | ||
801 | *status = lock_status; | 801 | *status = lock_status; |
802 | 802 | ||
@@ -836,7 +836,7 @@ static int xc5000_sleep(struct dvb_frontend *fe) | |||
836 | struct xc5000_priv *priv = fe->tuner_priv; | 836 | struct xc5000_priv *priv = fe->tuner_priv; |
837 | int ret; | 837 | int ret; |
838 | 838 | ||
839 | dprintk(1, "%s()\n", __FUNCTION__); | 839 | dprintk(1, "%s()\n", __func__); |
840 | 840 | ||
841 | /* On Pinnacle PCTV HD 800i, the tuner cannot be reinitialized | 841 | /* On Pinnacle PCTV HD 800i, the tuner cannot be reinitialized |
842 | * once shutdown without reloading the driver. Maybe I am not | 842 | * once shutdown without reloading the driver. Maybe I am not |
@@ -848,7 +848,7 @@ static int xc5000_sleep(struct dvb_frontend *fe) | |||
848 | if(ret != XC_RESULT_SUCCESS) { | 848 | if(ret != XC_RESULT_SUCCESS) { |
849 | printk(KERN_ERR | 849 | printk(KERN_ERR |
850 | "xc5000: %s() unable to shutdown tuner\n", | 850 | "xc5000: %s() unable to shutdown tuner\n", |
851 | __FUNCTION__); | 851 | __func__); |
852 | return -EREMOTEIO; | 852 | return -EREMOTEIO; |
853 | } | 853 | } |
854 | else { | 854 | else { |
@@ -860,7 +860,7 @@ static int xc5000_sleep(struct dvb_frontend *fe) | |||
860 | static int xc5000_init(struct dvb_frontend *fe) | 860 | static int xc5000_init(struct dvb_frontend *fe) |
861 | { | 861 | { |
862 | struct xc5000_priv *priv = fe->tuner_priv; | 862 | struct xc5000_priv *priv = fe->tuner_priv; |
863 | dprintk(1, "%s()\n", __FUNCTION__); | 863 | dprintk(1, "%s()\n", __func__); |
864 | 864 | ||
865 | if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) { | 865 | if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) { |
866 | printk(KERN_ERR "xc5000: Unable to initialise tuner\n"); | 866 | printk(KERN_ERR "xc5000: Unable to initialise tuner\n"); |
@@ -875,7 +875,7 @@ static int xc5000_init(struct dvb_frontend *fe) | |||
875 | 875 | ||
876 | static int xc5000_release(struct dvb_frontend *fe) | 876 | static int xc5000_release(struct dvb_frontend *fe) |
877 | { | 877 | { |
878 | dprintk(1, "%s()\n", __FUNCTION__); | 878 | dprintk(1, "%s()\n", __func__); |
879 | kfree(fe->tuner_priv); | 879 | kfree(fe->tuner_priv); |
880 | fe->tuner_priv = NULL; | 880 | fe->tuner_priv = NULL; |
881 | return 0; | 881 | return 0; |
@@ -907,7 +907,7 @@ struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe, | |||
907 | struct xc5000_priv *priv = NULL; | 907 | struct xc5000_priv *priv = NULL; |
908 | u16 id = 0; | 908 | u16 id = 0; |
909 | 909 | ||
910 | dprintk(1, "%s()\n", __FUNCTION__); | 910 | dprintk(1, "%s()\n", __func__); |
911 | 911 | ||
912 | priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL); | 912 | priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL); |
913 | if (priv == NULL) | 913 | if (priv == NULL) |