From: Steven Toth <stoth@linuxtv.org>
Date: Thu, 16 Oct 2008 23:17:31 +0000 (-0300)
Subject: V4L/DVB (9250): cx88: Convert __FUNCTION__ to __func__
X-Git-Tag: v2.6.28-rc1~256^2~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2af03eeadf460656642c2553c783537e7ad02875;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 0dd0ff9227f..d13bd140dc7 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)
 
 	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;
 	}
 
@@ -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);
@@ -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:
@@ -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);
@@ -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:
@@ -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,
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 22c2a88fbf1..1d8c8dd3006 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,
 		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;
 	}
 
@@ -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;
 		}