Skip to content

Commit

Permalink
V4L/DVB (9250): cx88: Convert __FUNCTION__ to __func__
Browse files Browse the repository at this point in the history 
cx88: Convert __FUNCTION__ to __func__

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Oct 17, 2008
1 parent 3dfbe31 commit 2af03ee
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
24 changes: 12 additions & 12 deletions drivers/media/video/cx88/cx88-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)

fe_id = videobuf_dvb_find_frontend(&dev->frontends, fe);
if (!fe_id) {
printk(KERN_ERR "%s() No frontend found\n", __FUNCTION__);
printk(KERN_ERR "%s() No frontend found\n", __func__);
return -EINVAL;
}

Expand Down Expand Up @@ -655,10 +655,10 @@ static int dvb_register(struct cx8802_dev *dev)
if (fe0->dvb.frontend) {
if (!dvb_attach(isl6421_attach, fe0->dvb.frontend,
&dev->core->i2c_adap, 0x08, ISL6421_DCL, 0x00)) {
dprintk( 1, "%s(): HVR3000 - DVB-S LNB Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR3000 - DVB-S LNB Init: failed\n", __func__);
}
} else {
dprintk( 1, "%s(): HVR3000 - DVB-S Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR3000 - DVB-S Init: failed\n", __func__);
}
/* DVB-T init */
fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
Expand All @@ -673,13 +673,13 @@ static int dvb_register(struct cx8802_dev *dev)
if(!dvb_attach(simple_tuner_attach, fe1->dvb.frontend,
&dev->core->i2c_adap, 0x61,
TUNER_PHILIPS_FMD1216ME_MK3)) {
dprintk( 1, "%s(): HVR3000 - DVB-T misc Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR3000 - DVB-T misc Init: failed\n", __func__);
}
} else {
dprintk( 1, "%s(): HVR3000 - DVB-T Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR3000 - DVB-T Init: failed\n", __func__);
}
} else {
dprintk( 1, "%s(): HVR3000 - DVB-T Init: can't find frontend 2.\n", __FUNCTION__);
dprintk( 1, "%s(): HVR3000 - DVB-T Init: can't find frontend 2.\n", __func__);
}
break;
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
Expand Down Expand Up @@ -1000,10 +1000,10 @@ static int dvb_register(struct cx8802_dev *dev)
if (fe0->dvb.frontend) {
if(!dvb_attach(isl6421_attach, fe0->dvb.frontend,
&dev->core->i2c_adap, 0x08, ISL6421_DCL, 0x00)) {
dprintk( 1, "%s(): HVR4000 - DVB-S LNB Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR4000 - DVB-S LNB Init: failed\n", __func__);
}
} else {
dprintk( 1, "%s(): HVR4000 - DVB-S Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR4000 - DVB-S Init: failed\n", __func__);
}
/* DVB-T Init */
fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
Expand All @@ -1018,13 +1018,13 @@ static int dvb_register(struct cx8802_dev *dev)
if(!dvb_attach(simple_tuner_attach, fe1->dvb.frontend,
&dev->core->i2c_adap, 0x61,
TUNER_PHILIPS_FMD1216ME_MK3)) {
dprintk( 1, "%s(): HVR4000 - DVB-T misc Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR4000 - DVB-T misc Init: failed\n", __func__);
}
} else {
dprintk( 1, "%s(): HVR4000 - DVB-T Init: failed\n", __FUNCTION__);
dprintk( 1, "%s(): HVR4000 - DVB-T Init: failed\n", __func__);
}
} else {
dprintk( 1, "%s(): HVR4000 - DVB-T Init: can't find frontend 2.\n", __FUNCTION__);
dprintk( 1, "%s(): HVR4000 - DVB-T Init: can't find frontend 2.\n", __func__);
}
break;
case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
Expand Down Expand Up @@ -1224,7 +1224,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
for (i = 1; i <= core->board.num_frontends; i++) {
fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
if (!fe) {
printk(KERN_ERR "%s() failed to get frontend(%d)\n", __FUNCTION__, i);
printk(KERN_ERR "%s() failed to get frontend(%d)\n", __func__, i);
continue;
}
videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/video/cx88/cx88-mpeg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
goto fail_core;

if (!core->board.num_frontends) {
printk(KERN_ERR "%s() .num_frontends should be non-zero, err = %d\n", __FUNCTION__, err);
printk(KERN_ERR "%s() .num_frontends should be non-zero, err = %d\n", __func__, err);
goto fail_core;
}

Expand All @@ -804,12 +804,12 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
mutex_init(&dev->frontends.lock);
INIT_LIST_HEAD(&dev->frontends.frontend.felist);

printk(KERN_INFO "%s() allocating %d frontend(s)\n", __FUNCTION__, core->board.num_frontends);
printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends);

for (i = 1; i <= core->board.num_frontends; i++) {
demod = videobuf_dvb_alloc_frontend(dev, &dev->frontends, i);
if(demod == NULL) {
printk(KERN_ERR "%s() failed to alloc\n", __FUNCTION__);
printk(KERN_ERR "%s() failed to alloc\n", __func__);
err = -ENOMEM;
goto fail_free;
}
Expand Down

0 comments on commit 2af03ee

Please sign in to comment.