The patch number 9250 was added via Steven Toth <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Steven Toth <[EMAIL PROTECTED]>
cx88: Convert __FUNCTION__ to __func__
cx88: Convert __FUNCTION__ to __func__
Priority: normal
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx88/cx88-alsa.c | 2 -
linux/drivers/media/video/cx88/cx88-dvb.c | 24 ++++++++++-----------
linux/drivers/media/video/cx88/cx88-mpeg.c | 6 ++---
3 files changed, 16 insertions(+), 16 deletions(-)
diff -r 14f150dc3de6 -r 449dd6c6cf70 linux/drivers/media/video/cx88/cx88-alsa.c
--- a/linux/drivers/media/video/cx88/cx88-alsa.c Fri Oct 17 09:26:39
2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c Thu Oct 16 19:17:31
2008 -0400
@@ -60,7 +60,7 @@
#define timestamp() if(debug>=2) { u64 time; u32 rem; rdtscll(time); \
time = (time - chip->starttime)<<12; \
rem = do_div(time, INT); \
- dprintk(2, "%s - called at %u.%03u us\n", __FUNCTION__, \
+ dprintk(2, "%s - called at %u.%03u us\n", __func__, \
(unsigned int)time, (rem << 9) / FRAC); }
#endif
/****************************************************************************
diff -r 14f150dc3de6 -r 449dd6c6cf70 linux/drivers/media/video/cx88/cx88-dvb.c
--- a/linux/drivers/media/video/cx88/cx88-dvb.c Fri Oct 17 09:26:39 2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c Thu Oct 16 19:17:31 2008 -0400
@@ -121,7 +121,7 @@ static int cx88_dvb_bus_ctrl(struct dvb_
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;
}
@@ -662,10 +662,10 @@ static int dvb_register(struct cx8802_de
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);
@@ -680,13 +680,13 @@ static int dvb_register(struct cx8802_de
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:
@@ -1007,10 +1007,10 @@ static int dvb_register(struct cx8802_de
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);
@@ -1025,13 +1025,13 @@ static int dvb_register(struct cx8802_de
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:
@@ -1234,7 +1234,7 @@ static int cx8802_dvb_probe(struct cx880
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 -r 14f150dc3de6 -r 449dd6c6cf70 linux/drivers/media/video/cx88/cx88-mpeg.c
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Oct 17 09:26:39
2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Thu Oct 16 19:17:31
2008 -0400
@@ -823,7 +823,7 @@ static int __devinit cx8802_probe(struct
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;
}
@@ -844,12 +844,12 @@ static int __devinit cx8802_probe(struct
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;
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/449dd6c6cf701b23e94256a81a0335317afdcca6
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
