summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2008-07-21 16:20:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:36:56 -0200
commit26d2e854bc242f0134a4be7f1eed98129d96d943 (patch)
tree18d3f78529ad84a8002d31130a73004b08d825d7
parenteb1b27bd86db6f9f73d6db973b18f31790a3d410 (diff)
downloadkernel-crypto-26d2e854bc242f0134a4be7f1eed98129d96d943.tar.gz
kernel-crypto-26d2e854bc242f0134a4be7f1eed98129d96d943.tar.xz
kernel-crypto-26d2e854bc242f0134a4be7f1eed98129d96d943.zip
V4L/DVB (8559): replace __FUNCTION__ with __func__
v4l: replace __FUNCTION__ with __func__ Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx23885/cx23885-core.c2
-rw-r--r--include/media/saa7146.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 25fb0993874..beb3e61669a 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1442,7 +1442,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)
struct cx23885_dev *dev = port->dev;
struct cx23885_dmaqueue *q = &port->mpegq;
- dprintk(1, "%s()\n", __FUNCTION__);
+ dprintk(1, "%s()\n", __func__);
del_timer_sync(&q->timeout);
cx23885_stop_dma(port);
do_cancel_buffers(port, "cancel", 0);
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 2f68f4cd003..64a2ec746a3 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -30,7 +30,7 @@ extern unsigned int saa7146_debug;
#define DEBUG_VARIABLE saa7146_debug
#endif
-#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__)
+#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME, __func__)
#define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; }
#define ERR(x) { DEBUG_PROLOG; printk x; }