aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSteven Toth <stoth@linuxtv.org>2008-10-16 19:17:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-17 16:27:11 -0400
commit2af03eeadf460656642c2553c783537e7ad02875 (patch)
tree8a1af4666c8059f802d8c7ae10d47d90bf28a6f2 /drivers/media
parent3dfbe31f09fb1da5f17437fd384cdfb6114765d9 (diff)
V4L/DVB (9250): cx88: Convert __FUNCTION__ to __func__
cx88: Convert __FUNCTION__ to __func__ Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c24
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c6
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 0dd0ff9227fb..d13bd140dc76 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -120,7 +120,7 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)
120 120
121 fe_id = videobuf_dvb_find_frontend(&dev->frontends, fe); 121 fe_id = videobuf_dvb_find_frontend(&dev->frontends, fe);
122 if (!fe_id) { 122 if (!fe_id) {
123 printk(KERN_ERR "%s() No frontend found\n", __FUNCTION__); 123 printk(KERN_ERR "%s() No frontend found\n", __func__);
124 return -EINVAL; 124 return -EINVAL;
125 } 125 }
126 126
@@ -655,10 +655,10 @@ static int dvb_register(struct cx8802_dev *dev)
655 if (fe0->dvb.frontend) { 655 if (fe0->dvb.frontend) {
656 if (!dvb_attach(isl6421_attach, fe0->dvb.frontend, 656 if (!dvb_attach(isl6421_attach, fe0->dvb.frontend,
657 &dev->core->i2c_adap, 0x08, ISL6421_DCL, 0x00)) { 657 &dev->core->i2c_adap, 0x08, ISL6421_DCL, 0x00)) {
658 dprintk( 1, "%s(): HVR3000 - DVB-S LNB Init: failed\n", __FUNCTION__); 658 dprintk( 1, "%s(): HVR3000 - DVB-S LNB Init: failed\n", __func__);
659 } 659 }
660 } else { 660 } else {
661 dprintk( 1, "%s(): HVR3000 - DVB-S Init: failed\n", __FUNCTION__); 661 dprintk( 1, "%s(): HVR3000 - DVB-S Init: failed\n", __func__);
662 } 662 }
663 /* DVB-T init */ 663 /* DVB-T init */
664 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2); 664 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
@@ -673,13 +673,13 @@ static int dvb_register(struct cx8802_dev *dev)
673 if(!dvb_attach(simple_tuner_attach, fe1->dvb.frontend, 673 if(!dvb_attach(simple_tuner_attach, fe1->dvb.frontend,
674 &dev->core->i2c_adap, 0x61, 674 &dev->core->i2c_adap, 0x61,
675 TUNER_PHILIPS_FMD1216ME_MK3)) { 675 TUNER_PHILIPS_FMD1216ME_MK3)) {
676 dprintk( 1, "%s(): HVR3000 - DVB-T misc Init: failed\n", __FUNCTION__); 676 dprintk( 1, "%s(): HVR3000 - DVB-T misc Init: failed\n", __func__);
677 } 677 }
678 } else { 678 } else {
679 dprintk( 1, "%s(): HVR3000 - DVB-T Init: failed\n", __FUNCTION__); 679 dprintk( 1, "%s(): HVR3000 - DVB-T Init: failed\n", __func__);
680 } 680 }
681 } else { 681 } else {
682 dprintk( 1, "%s(): HVR3000 - DVB-T Init: can't find frontend 2.\n", __FUNCTION__); 682 dprintk( 1, "%s(): HVR3000 - DVB-T Init: can't find frontend 2.\n", __func__);
683 } 683 }
684 break; 684 break;
685 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: 685 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
@@ -1000,10 +1000,10 @@ static int dvb_register(struct cx8802_dev *dev)
1000 if (fe0->dvb.frontend) { 1000 if (fe0->dvb.frontend) {
1001 if(!dvb_attach(isl6421_attach, fe0->dvb.frontend, 1001 if(!dvb_attach(isl6421_attach, fe0->dvb.frontend,
1002 &dev->core->i2c_adap, 0x08, ISL6421_DCL, 0x00)) { 1002 &dev->core->i2c_adap, 0x08, ISL6421_DCL, 0x00)) {
1003 dprintk( 1, "%s(): HVR4000 - DVB-S LNB Init: failed\n", __FUNCTION__); 1003 dprintk( 1, "%s(): HVR4000 - DVB-S LNB Init: failed\n", __func__);
1004 } 1004 }
1005 } else { 1005 } else {
1006 dprintk( 1, "%s(): HVR4000 - DVB-S Init: failed\n", __FUNCTION__); 1006 dprintk( 1, "%s(): HVR4000 - DVB-S Init: failed\n", __func__);
1007 } 1007 }
1008 /* DVB-T Init */ 1008 /* DVB-T Init */
1009 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2); 1009 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
@@ -1018,13 +1018,13 @@ static int dvb_register(struct cx8802_dev *dev)
1018 if(!dvb_attach(simple_tuner_attach, fe1->dvb.frontend, 1018 if(!dvb_attach(simple_tuner_attach, fe1->dvb.frontend,
1019 &dev->core->i2c_adap, 0x61, 1019 &dev->core->i2c_adap, 0x61,
1020 TUNER_PHILIPS_FMD1216ME_MK3)) { 1020 TUNER_PHILIPS_FMD1216ME_MK3)) {
1021 dprintk( 1, "%s(): HVR4000 - DVB-T misc Init: failed\n", __FUNCTION__); 1021 dprintk( 1, "%s(): HVR4000 - DVB-T misc Init: failed\n", __func__);
1022 } 1022 }
1023 } else { 1023 } else {
1024 dprintk( 1, "%s(): HVR4000 - DVB-T Init: failed\n", __FUNCTION__); 1024 dprintk( 1, "%s(): HVR4000 - DVB-T Init: failed\n", __func__);
1025 } 1025 }
1026 } else { 1026 } else {
1027 dprintk( 1, "%s(): HVR4000 - DVB-T Init: can't find frontend 2.\n", __FUNCTION__); 1027 dprintk( 1, "%s(): HVR4000 - DVB-T Init: can't find frontend 2.\n", __func__);
1028 } 1028 }
1029 break; 1029 break;
1030 case CX88_BOARD_HAUPPAUGE_HVR4000LITE: 1030 case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
@@ -1224,7 +1224,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
1224 for (i = 1; i <= core->board.num_frontends; i++) { 1224 for (i = 1; i <= core->board.num_frontends; i++) {
1225 fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i); 1225 fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
1226 if (!fe) { 1226 if (!fe) {
1227 printk(KERN_ERR "%s() failed to get frontend(%d)\n", __FUNCTION__, i); 1227 printk(KERN_ERR "%s() failed to get frontend(%d)\n", __func__, i);
1228 continue; 1228 continue;
1229 } 1229 }
1230 videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops, 1230 videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 22c2a88fbf1c..1d8c8dd3006a 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -783,7 +783,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
783 goto fail_core; 783 goto fail_core;
784 784
785 if (!core->board.num_frontends) { 785 if (!core->board.num_frontends) {
786 printk(KERN_ERR "%s() .num_frontends should be non-zero, err = %d\n", __FUNCTION__, err); 786 printk(KERN_ERR "%s() .num_frontends should be non-zero, err = %d\n", __func__, err);
787 goto fail_core; 787 goto fail_core;
788 } 788 }
789 789
@@ -804,12 +804,12 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
804 mutex_init(&dev->frontends.lock); 804 mutex_init(&dev->frontends.lock);
805 INIT_LIST_HEAD(&dev->frontends.frontend.felist); 805 INIT_LIST_HEAD(&dev->frontends.frontend.felist);
806 806
807 printk(KERN_INFO "%s() allocating %d frontend(s)\n", __FUNCTION__, core->board.num_frontends); 807 printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends);
808 808
809 for (i = 1; i <= core->board.num_frontends; i++) { 809 for (i = 1; i <= core->board.num_frontends; i++) {
810 demod = videobuf_dvb_alloc_frontend(dev, &dev->frontends, i); 810 demod = videobuf_dvb_alloc_frontend(dev, &dev->frontends, i);
811 if(demod == NULL) { 811 if(demod == NULL) {
812 printk(KERN_ERR "%s() failed to alloc\n", __FUNCTION__); 812 printk(KERN_ERR "%s() failed to alloc\n", __func__);
813 err = -ENOMEM; 813 err = -ENOMEM;
814 goto fail_free; 814 goto fail_free;
815 } 815 }