diff options
-rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 2 | ||||
-rw-r--r-- | include/media/saa7146.h | 2 |
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 25fb09938744..beb3e61669a3 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) | |||
1442 | struct cx23885_dev *dev = port->dev; | 1442 | struct cx23885_dev *dev = port->dev; |
1443 | struct cx23885_dmaqueue *q = &port->mpegq; | 1443 | struct cx23885_dmaqueue *q = &port->mpegq; |
1444 | 1444 | ||
1445 | dprintk(1, "%s()\n", __FUNCTION__); | 1445 | dprintk(1, "%s()\n", __func__); |
1446 | del_timer_sync(&q->timeout); | 1446 | del_timer_sync(&q->timeout); |
1447 | cx23885_stop_dma(port); | 1447 | cx23885_stop_dma(port); |
1448 | do_cancel_buffers(port, "cancel", 0); | 1448 | do_cancel_buffers(port, "cancel", 0); |
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 2f68f4cd0037..64a2ec746a3e 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h | |||
@@ -30,7 +30,7 @@ extern unsigned int saa7146_debug; | |||
30 | #define DEBUG_VARIABLE saa7146_debug | 30 | #define DEBUG_VARIABLE saa7146_debug |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__) | 33 | #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME, __func__) |
34 | #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } | 34 | #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } |
35 | 35 | ||
36 | #define ERR(x) { DEBUG_PROLOG; printk x; } | 36 | #define ERR(x) { DEBUG_PROLOG; printk x; } |