V4L/DVB (7521): media/video/cx88 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/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 2f5a4a4..87c751a 100644 (file)
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -494,7 +494,7 @@ static snd_pcm_uframes_t snd_cx88_pointer(struct snd_pcm_substream *substream)
 
        count = atomic_read(&chip->count);
 
-//     dprintk(2, "%s - count %d (+%u), period %d, frame %lu\n", __FUNCTION__,
+//     dprintk(2, "%s - count %d (+%u), period %d, frame %lu\n", __func__,
 //             count, new, count & (runtime->periods-1),
 //             runtime->period_size * (count & (runtime->periods-1)));
        return runtime->period_size * (count & (runtime->periods-1));

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 8d54e7a..61c4f72 100644 (file)
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -314,7 +314,7 @@ static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 dat
        u32 value, flag, retval;
        int i;
 
-       dprintk(1,"%s: 0x%X\n", __FUNCTION__, command);
+       dprintk(1,"%s: 0x%X\n", __func__, command);
 
        /* this may not be 100% safe if we can't read any memory location
           without side effects */
@@ -1055,7 +1055,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
 
        dev = cx8802_get_device(inode);
 
-       dprintk( 1, "%s\n", __FUNCTION__);
+       dprintk( 1, "%s\n", __func__);
 
        if (dev == NULL)
                return -ENODEV;
@@ -1065,7 +1065,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
        if (drv) {
                err = drv->request_acquire(drv);
                if(err != 0) {
-                       dprintk(1,"%s: Unable to acquire hardware, %d\n", __FUNCTION__, err);
+                       dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
                        return err;
                }
        }
@@ -1284,7 +1284,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
        struct cx8802_dev *dev = core->dvbdev;
        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",
                core->boardnr,
                core->name,

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 6039a8f..c4d1aff 100644 (file)
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -548,7 +548,7 @@ void cx88_wakeup(struct cx88_core *core,
                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
        }
        if (bc != 1)
-               printk("%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
+               printk("%s: %d buffers handled (should be 1)\n",__func__,bc);
 }
 
 void cx88_shutdown(struct cx88_core *core)
@@ -577,7 +577,7 @@ void cx88_shutdown(struct cx88_core *core)
 
 int cx88_reset(struct cx88_core *core)
 {
-       dprintk(1,"%s\n",__FUNCTION__);
+       dprintk(1,"%s\n",__func__);
        cx88_shutdown(core);
 
        /* clear irq status */

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 5e7c7fd..8fc929e 100644 (file)
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -282,7 +282,7 @@ static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)
        struct cx8802_dev *dev= fe->dvb->priv;
        struct cx88_core *core = dev->core;
 
-       dprintk(1, "%s: index = %d\n", __FUNCTION__, index);
+       dprintk(1, "%s: index = %d\n", __func__, index);
        if (index == 0)
                cx_clear(MO_GP0_IO, 8);
        else
@@ -380,7 +380,7 @@ static int cx88_pci_nano_callback(void *ptr, int command, int arg)
        switch (command) {
        case XC2028_TUNER_RESET:
                /* Send the tuner in then out of reset */
-               dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
+               dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
 
                switch (core->boardnr) {
                case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
@@ -396,10 +396,10 @@ static int cx88_pci_nano_callback(void *ptr, int command, int arg)
 
                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;
        }
@@ -872,7 +872,7 @@ static int cx8802_dvb_advise_acquire(struct cx8802_driver *drv)
 {
        struct cx88_core *core = drv->core;
        int err = 0;
-       dprintk( 1, "%s\n", __FUNCTION__);
+       dprintk( 1, "%s\n", __func__);
 
        switch (core->boardnr) {
        case CX88_BOARD_HAUPPAUGE_HVR1300:
@@ -895,7 +895,7 @@ static int cx8802_dvb_advise_release(struct cx8802_driver *drv)
 {
        struct cx88_core *core = drv->core;
        int err = 0;
-       dprintk( 1, "%s\n", __FUNCTION__);
+       dprintk( 1, "%s\n", __func__);
 
        switch (core->boardnr) {
        case CX88_BOARD_HAUPPAUGE_HVR1300:
@@ -913,7 +913,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
        struct cx8802_dev *dev = drv->core->dvbdev;
        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",
                core->boardnr,
                core->name,

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 6467ca3..a6b061c 100644 (file)
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -146,7 +146,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
                cx_write(TS_GEN_CNTRL, 0x06); /* punctured clock TS & posedge driven */
                udelay(100);
        } else {
-               printk( "%s() Failed. Unsupported value in .mpeg (0x%08x)\n", __FUNCTION__,
+               printk( "%s() Failed. Unsupported value in .mpeg (0x%08x)\n", __func__,
                        core->board.mpeg );
                return -EINVAL;
        }
@@ -247,7 +247,7 @@ int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev,
        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
        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;
 
@@ -289,7 +289,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_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" );
@@ -299,7 +299,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                buf->count    = cx88q->count++;
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk( 1, "[%p/%d] %s - append to active\n",
-                       buf, buf->vb.i, __FUNCTION__);
+                       buf, buf->vb.i, __func__);
        }
 }
 
@@ -342,7 +342,7 @@ static void cx8802_timeout(unsigned long data)
 {
        struct cx8802_dev *dev = (struct cx8802_dev*)data;
 
-       dprintk(1, "%s\n",__FUNCTION__);
+       dprintk(1, "%s\n",__func__);
 
        if (debug)
                cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
@@ -625,7 +625,7 @@ static int cx8802_request_acquire(struct cx8802_driver *drv)
                }
                mutex_unlock(&drv->core->lock);
 
-               mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
+               mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __func__, cx_read(MO_GP0_IO));
        }
 
        return 0;
@@ -641,7 +641,7 @@ static int cx8802_request_release(struct cx8802_driver *drv)
        {
                drv->advise_release(drv);
                core->active_type_id = CX88_BOARD_NONE;
-               mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
+               mpeg_dbg(1,"%s() Post release GPIO=%x\n", __func__, cx_read(MO_GP0_IO));
        }
        mutex_unlock(&drv->core->lock);
 
@@ -815,7 +815,7 @@ static void __devexit cx8802_remove(struct pci_dev *pci_dev)
 
        dev = pci_get_drvdata(pci_dev);
 
-       dprintk( 1, "%s\n", __FUNCTION__);
+       dprintk( 1, "%s\n", __func__);
 
        if (!list_empty(&dev->drvlist)) {
                struct cx8802_driver *drv, *tmp;

diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index c574f45..3a1977f 100644 (file)
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -265,12 +265,12 @@ static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap,
        mode |= EN_FMRADIO_EN_RDS;
 
        if (sap) {
-               dprintk("%s SAP (status: unknown)\n", __FUNCTION__);
+               dprintk("%s SAP (status: unknown)\n", __func__);
                set_audio_start(core, SEL_SAP);
                set_audio_registers(core, btsc_sap);
                set_audio_finish(core, mode);
        } else {
-               dprintk("%s (status: known-good)\n", __FUNCTION__);
+               dprintk("%s (status: known-good)\n", __func__);
                set_audio_start(core, SEL_BTSC);
                set_audio_registers(core, btsc);
                set_audio_finish(core, mode);
@@ -351,16 +351,16 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
        set_audio_start(core,SEL_NICAM);
        switch (core->tvaudio) {
        case WW_L:
-               dprintk("%s SECAM-L NICAM (status: devel)\n", __FUNCTION__);
+               dprintk("%s SECAM-L NICAM (status: devel)\n", __func__);
                set_audio_registers(core, nicam_l);
                break;
        case WW_I:
-               dprintk("%s PAL-I NICAM (status: known-good)\n", __FUNCTION__);
+               dprintk("%s PAL-I NICAM (status: known-good)\n", __func__);
                set_audio_registers(core, nicam_bgdki_common);
                set_audio_registers(core, nicam_i);
                break;
        default:
-               dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __FUNCTION__);
+               dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __func__);
                set_audio_registers(core, nicam_bgdki_common);
                set_audio_registers(core, nicam_default);
                break;
@@ -600,28 +600,28 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
        set_audio_start(core, SEL_A2);
        switch (core->tvaudio) {
        case WW_BG:
-               dprintk("%s PAL-BG A1/2 (status: known-good)\n", __FUNCTION__);
+               dprintk("%s PAL-BG A1/2 (status: known-good)\n", __func__);
                set_audio_registers(core, a2_bgdk_common);
                set_audio_registers(core, a2_bg);
                set_audio_registers(core, a2_deemph50);
                break;
        case WW_DK:
-               dprintk("%s PAL-DK A1/2 (status: known-good)\n", __FUNCTION__);
+               dprintk("%s PAL-DK A1/2 (status: known-good)\n", __func__);
                set_audio_registers(core, a2_bgdk_common);
                set_audio_registers(core, a2_dk);
                set_audio_registers(core, a2_deemph50);
                break;
        case WW_I:
-               dprintk("%s PAL-I A1 (status: known-good)\n", __FUNCTION__);
+               dprintk("%s PAL-I A1 (status: known-good)\n", __func__);
                set_audio_registers(core, a1_i);
                set_audio_registers(core, a2_deemph50);
                break;
        case WW_L:
-               dprintk("%s AM-L (status: devel)\n", __FUNCTION__);
+               dprintk("%s AM-L (status: devel)\n", __func__);
                set_audio_registers(core, am_l);
                break;
        default:
-               dprintk("%s Warning: wrong value\n", __FUNCTION__);
+               dprintk("%s Warning: wrong value\n", __func__);
                return;
                break;
        };
@@ -637,7 +637,7 @@ static void set_audio_standard_EIAJ(struct cx88_core *core)
 
                { /* end of list */ },
        };
-       dprintk("%s (status: unknown)\n", __FUNCTION__);
+       dprintk("%s (status: unknown)\n", __func__);
 
        set_audio_start(core, SEL_EIAJ);
        set_audio_registers(core, eiaj);
@@ -691,7 +691,7 @@ static void set_audio_standard_FM(struct cx88_core *core,
                { /* end of list */ },
        };
 
-       dprintk("%s (status: unknown)\n", __FUNCTION__);
+       dprintk("%s (status: unknown)\n", __func__);
        set_audio_start(core, SEL_FMRADIO);
 
        switch (deemph) {