From 3639224d6e1d7bfe1cb6ac26dd9028ca47049175 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Mon, 21 Jul 2008 16:20:32 -0300 Subject: [PATCH] --- yaml --- r: 113887 b: refs/heads/master c: 26d2e854bc242f0134a4be7f1eed98129d96d943 h: refs/heads/master i: 113885: 875fc847429a79775283e28466b191c69b3488ba 113883: 7fda112d60904c768e6a77e33598049e6dfc2923 113879: 8a8aa5858da46f30cc2d8d1a826fb43f9857618e 113871: e5700ed5a34b3b07c7a085fd43eb6bc6575d577b 113855: 9be43e4b47721a67d9693219b4855afffa6ed4f2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-core.c | 2 +- trunk/include/media/saa7146.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 40deca2abbd3..66bebb210261 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb1b27bd86db6f9f73d6db973b18f31790a3d410 +refs/heads/master: 26d2e854bc242f0134a4be7f1eed98129d96d943 diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c index 25fb09938744..beb3e61669a3 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-core.c +++ b/trunk/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/trunk/include/media/saa7146.h b/trunk/include/media/saa7146.h index 2f68f4cd0037..64a2ec746a3e 100644 --- a/trunk/include/media/saa7146.h +++ b/trunk/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; }