V4L/DVB (7520): media/video/cx23885 replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index dfa2698..77cd452 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -264,7 +264,7 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
                }
                else {
                        printk(KERN_ERR
-                               "%s(): Unknow command.\n", __FUNCTION__);
+                               "%s(): Unknow command.\n", __func__);
                        return -EINVAL;
                }
                break;

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index a77505d..52942d1 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -260,7 +260,7 @@ void cx23885_wakeup(struct cx23885_tsport *port,
        }
        if (bc != 1)
                printk("%s: %d buffers handled (should be 1)\n",
-                      __FUNCTION__, bc);
+                      __func__, bc);
 }
 
 int cx23885_sram_channel_setup(struct cx23885_dev *dev,
@@ -272,7 +272,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 
        if (ch->cmds_start == 0)
        {
-               dprintk(1, "%s() Erasing channel [%s]\n", __FUNCTION__,
+               dprintk(1, "%s() Erasing channel [%s]\n", __func__,
                        ch->name);
                cx_write(ch->ptr1_reg, 0);
                cx_write(ch->ptr2_reg, 0);
@@ -280,7 +280,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
                cx_write(ch->cnt1_reg, 0);
                return 0;
        } else {
-               dprintk(1, "%s() Configuring channel [%s]\n", __FUNCTION__,
+               dprintk(1, "%s() Configuring channel [%s]\n", __func__,
                        ch->name);
        }
 
@@ -297,7 +297,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 
        /* write CDT */
        for (i = 0; i < lines; i++) {
-               dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i,
+               dprintk(2, "%s() 0x%08x <- 0x%08x\n", __func__, cdt + 16*i,
                        ch->fifo_start + bpl*i);
                cx_write(cdt + 16*i, ch->fifo_start + bpl*i);
                cx_write(cdt + 16*i +  4, 0);
@@ -449,7 +449,7 @@ static void cx23885_shutdown(struct cx23885_dev *dev)
 
 static void cx23885_reset(struct cx23885_dev *dev)
 {
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        cx23885_shutdown(dev);
 
@@ -482,7 +482,7 @@ static void cx23885_reset(struct cx23885_dev *dev)
 
 static int cx23885_pci_quirks(struct cx23885_dev *dev)
 {
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        /* The cx23885 bridge has a weird bug which causes NMI to be asserted
         * when DMA begins if RDR_TLCTL0 bit4 is not cleared. It does not
@@ -513,7 +513,7 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 
 static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *port, int portno)
 {
-       dprintk(1, "%s(portno=%d)\n", __FUNCTION__, portno);
+       dprintk(1, "%s(portno=%d)\n", __func__, portno);
 
        /* Transport bus init dma queue  - Common settings */
        port->dma_ctl_val        = 0x11; /* Enable RISC controller and Fifo */
@@ -604,14 +604,14 @@ static void cx23885_dev_checkrevision(struct cx23885_dev *dev)
                break;
        default:
                printk(KERN_ERR "%s() New hardware revision found 0x%x\n",
-                       __FUNCTION__, dev->hwrevision);
+                       __func__, dev->hwrevision);
        }
        if (dev->hwrevision)
                printk(KERN_INFO "%s() Hardware revision = 0x%02x\n",
-                       __FUNCTION__, dev->hwrevision);
+                       __func__, dev->hwrevision);
        else
                printk(KERN_ERR "%s() Hardware revision unknown 0x%x\n",
-                       __FUNCTION__, dev->hwrevision);
+                       __func__, dev->hwrevision);
 }
 
 static int cx23885_dev_setup(struct cx23885_dev *dev)
@@ -644,7 +644,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
                BUG();
 
        dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
-               __FUNCTION__, dev->bridge);
+               __func__, dev->bridge);
 
        /* board config */
        dev->board = UNSET;
@@ -734,9 +734,9 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
        dev->radio_addr = cx23885_boards[dev->board].radio_addr;
 
        dprintk(1, "%s() tuner_type = 0x%x tuner_addr = 0x%x\n",
-               __FUNCTION__, dev->tuner_type, dev->tuner_addr);
+               __func__, dev->tuner_type, dev->tuner_addr);
        dprintk(1, "%s() radio_type = 0x%x radio_addr = 0x%x\n",
-               __FUNCTION__, dev->radio_type, dev->radio_addr);
+               __func__, dev->radio_type, dev->radio_addr);
 
        /* init hardware */
        cx23885_reset(dev);
@@ -751,21 +751,21 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
        if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
                if (cx23885_video_register(dev) < 0) {
                        printk(KERN_ERR "%s() Failed to register analog "
-                               "video adapters on VID_A\n", __FUNCTION__);
+                               "video adapters on VID_A\n", __func__);
                }
        }
 
        if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) {
                if (cx23885_dvb_register(&dev->ts1) < 0) {
                        printk(KERN_ERR "%s() Failed to register dvb adapters on VID_B\n",
-                              __FUNCTION__);
+                              __func__);
                }
        }
 
        if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) {
                if (cx23885_dvb_register(&dev->ts2) < 0) {
                        printk(KERN_ERR "%s() Failed to register dvb adapters on VID_C\n",
-                              __FUNCTION__);
+                              __func__);
                }
        }
 
@@ -960,50 +960,50 @@ static void cx23885_tsport_reg_dump(struct cx23885_tsport *port)
 {
        struct cx23885_dev *dev = port->dev;
 
-       dprintk(1, "%s() Register Dump\n", __FUNCTION__);
-       dprintk(1, "%s() DEV_CNTRL2               0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() Register Dump\n", __func__);
+       dprintk(1, "%s() DEV_CNTRL2               0x%08X\n", __func__,
                cx_read(DEV_CNTRL2));
-       dprintk(1, "%s() PCI_INT_MSK              0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() PCI_INT_MSK              0x%08X\n", __func__,
                cx_read(PCI_INT_MSK));
-       dprintk(1, "%s() AUD_INT_INT_MSK          0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() AUD_INT_INT_MSK          0x%08X\n", __func__,
                cx_read(AUDIO_INT_INT_MSK));
-       dprintk(1, "%s() AUD_INT_DMA_CTL          0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() AUD_INT_DMA_CTL          0x%08X\n", __func__,
                cx_read(AUD_INT_DMA_CTL));
-       dprintk(1, "%s() AUD_EXT_INT_MSK          0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() AUD_EXT_INT_MSK          0x%08X\n", __func__,
                cx_read(AUDIO_EXT_INT_MSK));
-       dprintk(1, "%s() AUD_EXT_DMA_CTL          0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() AUD_EXT_DMA_CTL          0x%08X\n", __func__,
                cx_read(AUD_EXT_DMA_CTL));
-       dprintk(1, "%s() PAD_CTRL                 0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() PAD_CTRL                 0x%08X\n", __func__,
                cx_read(PAD_CTRL));
-       dprintk(1, "%s() ALT_PIN_OUT_SEL          0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() ALT_PIN_OUT_SEL          0x%08X\n", __func__,
                cx_read(ALT_PIN_OUT_SEL));
-       dprintk(1, "%s() GPIO2                    0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() GPIO2                    0x%08X\n", __func__,
                cx_read(GPIO2));
-       dprintk(1, "%s() gpcnt(0x%08X)          0x%08X\n", __FUNCTION__,
+       dprintk(1, "%s() gpcnt(0x%08X)          0x%08X\n", __func__,
                port->reg_gpcnt, cx_read(port->reg_gpcnt));
-       dprintk(1, "%s() gpcnt_ctl(0x%08X)      0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() gpcnt_ctl(0x%08X)      0x%08x\n", __func__,
                port->reg_gpcnt_ctl, cx_read(port->reg_gpcnt_ctl));
-       dprintk(1, "%s() dma_ctl(0x%08X)        0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() dma_ctl(0x%08X)        0x%08x\n", __func__,
                port->reg_dma_ctl, cx_read(port->reg_dma_ctl));
-       dprintk(1, "%s() src_sel(0x%08X)        0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() src_sel(0x%08X)        0x%08x\n", __func__,
                port->reg_src_sel, cx_read(port->reg_src_sel));
-       dprintk(1, "%s() lngth(0x%08X)          0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() lngth(0x%08X)          0x%08x\n", __func__,
                port->reg_lngth, cx_read(port->reg_lngth));
-       dprintk(1, "%s() hw_sop_ctrl(0x%08X)    0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() hw_sop_ctrl(0x%08X)    0x%08x\n", __func__,
                port->reg_hw_sop_ctrl, cx_read(port->reg_hw_sop_ctrl));
-       dprintk(1, "%s() gen_ctrl(0x%08X)       0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() gen_ctrl(0x%08X)       0x%08x\n", __func__,
                port->reg_gen_ctrl, cx_read(port->reg_gen_ctrl));
-       dprintk(1, "%s() bd_pkt_status(0x%08X)  0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() bd_pkt_status(0x%08X)  0x%08x\n", __func__,
                port->reg_bd_pkt_status, cx_read(port->reg_bd_pkt_status));
-       dprintk(1, "%s() sop_status(0x%08X)     0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() sop_status(0x%08X)     0x%08x\n", __func__,
                port->reg_sop_status, cx_read(port->reg_sop_status));
-       dprintk(1, "%s() fifo_ovfl_stat(0x%08X) 0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() fifo_ovfl_stat(0x%08X) 0x%08x\n", __func__,
                port->reg_fifo_ovfl_stat, cx_read(port->reg_fifo_ovfl_stat));
-       dprintk(1, "%s() vld_misc(0x%08X)       0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() vld_misc(0x%08X)       0x%08x\n", __func__,
                port->reg_vld_misc, cx_read(port->reg_vld_misc));
-       dprintk(1, "%s() ts_clk_en(0x%08X)      0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() ts_clk_en(0x%08X)      0x%08x\n", __func__,
                port->reg_ts_clk_en, cx_read(port->reg_ts_clk_en));
-       dprintk(1, "%s() ts_int_msk(0x%08X)     0x%08x\n", __FUNCTION__,
+       dprintk(1, "%s() ts_int_msk(0x%08X)     0x%08x\n", __func__,
                port->reg_ts_int_msk, cx_read(port->reg_ts_int_msk));
 }
 
@@ -1013,7 +1013,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 {
        struct cx23885_dev *dev = port->dev;
 
-       dprintk(1, "%s() w: %d, h: %d, f: %d\n", __FUNCTION__,
+       dprintk(1, "%s() w: %d, h: %d, f: %d\n", __func__,
                buf->vb.width, buf->vb.height, buf->vb.field);
 
        /* setup fifo + format */
@@ -1031,7 +1031,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
        if ( (!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
                (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) ) {
                printk( "%s() Failed. Unsupported value in .portb/c (0x%08x)/(0x%08x)\n",
-                       __FUNCTION__,
+                       __func__,
                        cx23885_boards[dev->board].portb,
                        cx23885_boards[dev->board].portc );
                return -EINVAL;
@@ -1058,7 +1058,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
        case CX23885_BRIDGE_885:
        case CX23885_BRIDGE_887:
                /* enable irqs */
-               dprintk(1, "%s() enabling TS int's and DMA\n", __FUNCTION__ );
+               dprintk(1, "%s() enabling TS int's and DMA\n", __func__ );
                cx_set(port->reg_ts_int_msk,  port->ts_int_msk_val);
                cx_set(port->reg_dma_ctl, port->dma_ctl_val);
                cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask);
@@ -1078,7 +1078,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 static int cx23885_stop_dma(struct cx23885_tsport *port)
 {
        struct cx23885_dev *dev = port->dev;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        /* Stop interrupts and DMA */
        cx_clear(port->reg_ts_int_msk, port->ts_int_msk_val);
@@ -1093,13 +1093,13 @@ int cx23885_restart_queue(struct cx23885_tsport *port,
        struct cx23885_dev *dev = port->dev;
        struct cx23885_buffer *buf;
 
-       dprintk(5, "%s()\n", __FUNCTION__);
+       dprintk(5, "%s()\n", __func__);
        if (list_empty(&q->active))
        {
                struct cx23885_buffer *prev;
                prev = NULL;
 
-               dprintk(5, "%s() queue is empty\n", __FUNCTION__);
+               dprintk(5, "%s() queue is empty\n", __func__);
 
                for (;;) {
                        if (list_empty(&q->queued))
@@ -1154,7 +1154,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
        int size = port->ts_packet_size * port->ts_packet_count;
        int rc;
 
-       dprintk(1, "%s: %p\n", __FUNCTION__, buf);
+       dprintk(1, "%s: %p\n", __func__, buf);
        if (0 != buf->vb.baddr  &&  buf->vb.bsize < size)
                return -EINVAL;
 
@@ -1197,7 +1197,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                buf->count    = cx88q->count++;
                mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT);
                dprintk(1, "[%p/%d] %s - first active\n",
-                       buf, buf->vb.i, __FUNCTION__);
+                       buf, buf->vb.i, __func__);
        } else {
                dprintk( 1, "queue is not empty - append to active\n" );
                prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
@@ -1208,7 +1208,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
                dprintk( 1, "[%p/%d] %s - append to active\n",
-                        buf, buf->vb.i, __FUNCTION__);
+                        buf, buf->vb.i, __func__);
        }
 }
 
@@ -1245,7 +1245,7 @@ static void cx23885_timeout(unsigned long data)
        struct cx23885_tsport *port = (struct cx23885_tsport *)data;
        struct cx23885_dev *dev = port->dev;
 
-       dprintk(1, "%s()\n",__FUNCTION__);
+       dprintk(1, "%s()\n",__func__);
 
        if (debug > 5)
                cx23885_sram_channel_dump(dev, &dev->sram_channels[ port->sram_chno ]);

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 7bcd37a..74baa28 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -185,7 +185,7 @@ static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
        case XC2028_TUNER_RESET:
                /* Send the tuner in then out of reset */
                /* GPIO-2 xc3028 tuner */
-               dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
+               dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
 
                cx_set(GP0_IO, 0x00040000);
                cx_clear(GP0_IO, 0x00000004);
@@ -195,10 +195,10 @@ static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
                msleep(5);
                break;
        case XC2028_RESET_CLK:
-               dprintk(1, "%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg);
+               dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
                break;
        default:
-               dprintk(1, "%s: unknown command %d, arg %d\n", __FUNCTION__,
+               dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
                        command, arg);
                return -EINVAL;
        }
@@ -341,7 +341,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
        struct cx23885_dev *dev = port->dev;
        int err;
 
-       dprintk(1, "%s\n", __FUNCTION__);
+       dprintk(1, "%s\n", __func__);
        dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
                dev->board,
                dev->name,
@@ -357,7 +357,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
                            sizeof(struct cx23885_buffer), port);
        err = dvb_register(port);
        if (err != 0)
-               printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
+               printk("%s() dvb_register failed err = %d\n", __func__, err);
 
        return err;
 }

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 748c79a..8773a1f 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -87,10 +87,10 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
        int retval, cnt;
 
        if (joined_rlen)
-               dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __FUNCTION__,
+               dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __func__,
                        msg->len, joined_rlen);
        else
-               dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+               dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
 
        /* Deal with i2c probe functions with zero payload */
        if (msg->len == 0) {
@@ -101,7 +101,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                if (!i2c_slave_did_ack(i2c_adap))
                        return -EIO;
 
-               dprintk(1, "%s() returns 0\n", __FUNCTION__);
+               dprintk(1, "%s() returns 0\n", __func__);
                return 0;
        }
 
@@ -176,7 +176,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 
 
        if (i2c_debug && !joined)
-               dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+               dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
 
        /* Deal with i2c probe functions with zero payload */
        if (msg->len == 0) {
@@ -188,7 +188,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                        return -EIO;
 
 
-               dprintk(1, "%s() returns 0\n", __FUNCTION__);
+               dprintk(1, "%s() returns 0\n", __func__);
                return 0;
        }
 
@@ -238,11 +238,11 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap,
        struct cx23885_dev *dev = bus->dev;
        int i, retval = 0;
 
-       dprintk(1, "%s(num = %d)\n", __FUNCTION__, num);
+       dprintk(1, "%s(num = %d)\n", __func__, num);
 
        for (i = 0 ; i < num; i++) {
                dprintk(1, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
-                       __FUNCTION__, num, msgs[i].addr, msgs[i].len);
+                       __func__, num, msgs[i].addr, msgs[i].len);
                if (msgs[i].flags & I2C_M_RD) {
                        /* read */
                        retval = i2c_readbytes(i2c_adap, &msgs[i], 0);
@@ -383,7 +383,7 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 {
        struct cx23885_dev *dev = bus->dev;
 
-       dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr);
+       dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
 
        memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
               sizeof(bus->i2c_adap));

diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 45bf214..8465221 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -141,7 +141,7 @@ static struct cx23885_fmt *format_by_fourcc(unsigned int fourcc)
                if (formats[i].fourcc == fourcc)
                        return formats+i;
 
-       printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __FUNCTION__, fourcc);
+       printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __func__, fourcc);
        return NULL;
 }
 
@@ -292,13 +292,13 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
        }
        if (bc != 1)
                printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",
-                       __FUNCTION__, bc);
+                       __func__, bc);
 }
 
 int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 {
        dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",
-               __FUNCTION__,
+               __func__,
                (unsigned int)norm,
                v4l2_norm_to_name(norm));
 
@@ -319,7 +319,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
                                    char *type)
 {
        struct video_device *vfd;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        vfd = video_device_alloc();
        if (NULL == vfd)
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(cx23885_ctrl_query);
 static int res_get(struct cx23885_dev *dev, struct cx23885_fh *fh,
        unsigned int bit)
 {
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
        if (fh->resources & bit)
                /* have it already allocated */
                return 1;
@@ -392,7 +392,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
        unsigned int bits)
 {
        BUG_ON((fh->resources & bits) != bits);
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        mutex_lock(&dev->lock);
        fh->resources  &= ~bits;
@@ -407,7 +407,7 @@ int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
        memset(&route, 0, sizeof(route));
 
        dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
-               __FUNCTION__,
+               __func__,
                input, INPUT(input)->vmux,
                INPUT(input)->gpio0, INPUT(input)->gpio1,
                INPUT(input)->gpio2, INPUT(input)->gpio3);
@@ -427,7 +427,7 @@ EXPORT_SYMBOL(cx23885_video_mux);
 int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
        unsigned int height, enum v4l2_field field)
 {
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
        return 0;
 }
 
@@ -435,7 +435,7 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev,
                           struct cx23885_dmaqueue *q,
                           struct cx23885_buffer *buf)
 {
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        /* setup fifo + format */
        cx23885_sram_channel_setup(dev, &dev->sram_channels[SRAM_CH01],
@@ -463,7 +463,7 @@ static int cx23885_restart_video_queue(struct cx23885_dev *dev,
 {
        struct cx23885_buffer *buf, *prev;
        struct list_head *item;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        if (!list_empty(&q->active)) {
                buf = list_entry(q->active.next, struct cx23885_buffer,
@@ -579,13 +579,13 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                        if (dev->tvnorm & V4L2_STD_NTSC) {
                                /* cx25840 transmits NTSC bottom field first */
                                dprintk(1, "%s() Creating NTSC risc\n",
-                                       __FUNCTION__);
+                                       __func__);
                                line0_offset = buf->bpl;
                                line1_offset = 0;
                        } else {
                                /* All other formats are top field first */
                                dprintk(1, "%s() Creating PAL/SECAM risc\n",
-                                       __FUNCTION__);
+                                       __func__);
                                line0_offset = 0;
                                line1_offset = buf->bpl;
                        }
@@ -885,7 +885,7 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)
 
 int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
-       dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __FUNCTION__);
+       dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);
        cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);
        return 0;
 }
@@ -894,7 +894,7 @@ EXPORT_SYMBOL(cx23885_get_control);
 int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
        dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"
-               " (disabled - no action)\n", __FUNCTION__);
+               " (disabled - no action)\n", __func__);
        return 0;
 }
 EXPORT_SYMBOL(cx23885_set_control);
@@ -990,7 +990,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
        struct cx23885_dev *dev  = ((struct cx23885_fh *)priv)->dev;
        int err;
 
-       dprintk(2, "%s()\n", __FUNCTION__);
+       dprintk(2, "%s()\n", __func__);
        err = vidioc_try_fmt_cap(file, priv, f);
 
        if (0 != err)
@@ -999,7 +999,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
        fh->width      = f->fmt.pix.width;
        fh->height     = f->fmt.pix.height;
        fh->vidq.field = f->fmt.pix.field;
-       dprintk(2, "%s() width=%d height=%d field=%d\n", __FUNCTION__,
+       dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
                fh->width, fh->height, fh->vidq.field);
        cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_FMT, f);
        return 0;
@@ -1101,7 +1101,7 @@ static int vidioc_streamon(struct file *file, void *priv,
 {
        struct cx23885_fh *fh = priv;
        struct cx23885_dev *dev = fh->dev;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
                return -EINVAL;
@@ -1118,7 +1118,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
        struct cx23885_fh *fh = priv;
        struct cx23885_dev *dev = fh->dev;
        int err, res;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -1136,7 +1136,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)
 {
        struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        mutex_lock(&dev->lock);
        cx23885_set_tvnorm(dev, *tvnorms);
@@ -1159,7 +1159,7 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
                [CX23885_VMUX_DEBUG]      = "for debug only",
        };
        unsigned int n;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        n = i->index;
        if (n >= 4)
@@ -1184,7 +1184,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
                                struct v4l2_input *i)
 {
        struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
        return cx23885_enum_input(dev, i);
 }
 
@@ -1193,7 +1193,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
        struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
        *i = dev->input;
-       dprintk(1, "%s() returns %d\n", __FUNCTION__, *i);
+       dprintk(1, "%s() returns %d\n", __func__, *i);
        return 0;
 }
 
@@ -1201,10 +1201,10 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
 {
        struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
-       dprintk(1, "%s(%d)\n", __FUNCTION__, i);
+       dprintk(1, "%s(%d)\n", __func__, i);
 
        if (i >= 4) {
-               dprintk(1, "%s() -EINVAL\n", __FUNCTION__);
+               dprintk(1, "%s() -EINVAL\n", __func__);
                return -EINVAL;
        }
 
@@ -1389,7 +1389,7 @@ int cx23885_video_irq(struct cx23885_dev *dev, u32 status)
                return handled;
        cx_write(VID_A_INT_STAT, status);
 
-       dprintk(2, "%s() status = 0x%08x\n", __FUNCTION__, status);
+       dprintk(2, "%s() status = 0x%08x\n", __func__, status);
        /* risc op code error */
        if (status & (1 << 16)) {
                printk(KERN_WARNING "%s/0: video risc op code error\n",
@@ -1487,7 +1487,7 @@ static const struct file_operations radio_fops = {
 
 void cx23885_video_unregister(struct cx23885_dev *dev)
 {
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
        cx_clear(PCI_INT_MSK, 1);
 
        if (dev->video_dev) {
@@ -1505,7 +1505,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
 {
        int err;
 
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
        spin_lock_init(&dev->slock);
 
        /* Initialize VBI template */