V4L/DVB (7518): media/video/ 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/cpia.h b/drivers/media/video/cpia.h
index 78392fb6f94ea3dd8b430f338024b73d86a5842c..5096058bf5793a68b3ea69d748913cd34caaa3e6 100644 (file)
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -412,11 +412,11 @@ void cpia_unregister_camera(struct cam_data *cam);
 /* ErrorCode */
 #define ERROR_FLICKER_BELOW_MIN_EXP     0x01 /*flicker exposure got below minimum exposure */
 #define ALOG(fmt,args...) printk(fmt, ##args)
-#define LOG(fmt,args...) ALOG(KERN_INFO __FILE__ ":%s(%d):" fmt, __FUNCTION__ , __LINE__ , ##args)
+#define LOG(fmt,args...) ALOG(KERN_INFO __FILE__ ":%s(%d):" fmt, __func__ , __LINE__ , ##args)
 
 #ifdef _CPIA_DEBUG_
 #define ADBG(fmt,args...) printk(fmt, jiffies, ##args)
-#define DBG(fmt,args...) ADBG(KERN_DEBUG __FILE__" (%ld):%s(%d):" fmt, __FUNCTION__, __LINE__ , ##args)
+#define DBG(fmt,args...) ADBG(KERN_DEBUG __FILE__" (%ld):%s(%d):" fmt, __func__, __LINE__ , ##args)
 #else
 #define DBG(fmn,args...) do {} while(0)
 #endif

diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 9da4726eb9b981a21250565bbaaa8ed190052c3b..ef1f89399983549adc9192a9f9fd79259abcdc97 100644 (file)
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -170,7 +170,7 @@ static void cpia_usb_complete(struct urb *urb)
        /* resubmit */
        urb->dev = ucpia->dev;
        if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
-               printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __FUNCTION__,  i);
+               printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __func__,  i);
 }
 
 static int cpia_usb_open(void *privdata)

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 7942bd078513ac61b522c9a994e466ff3964acfa..11c5fdedc23bc341fb82ab4459d42b53bcab9a5f 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -153,7 +153,7 @@ static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        }
 
        if(buf[0] !=0 || buf[1] !=0 || buf[2] !=0 || buf[3] != 0)
-               dprintk(2, "%s: 0x%2x 0x%2x 0x%2x 0x%2x\n", __FUNCTION__,
+               dprintk(2, "%s: 0x%2x 0x%2x 0x%2x 0x%2x\n", __func__,
                        buf[0], buf[1], buf[2], buf[3]);
 
        /* no key pressed or signal from other ir remote */

diff --git a/drivers/media/video/mt20xx.h b/drivers/media/video/mt20xx.h
index 5e9c825d2e91bb392d283d04a776c6aa7dc1de11..aa848e14ce5e75bbf43b8edecc057fdc209af33b 100644 (file)
--- a/drivers/media/video/mt20xx.h
+++ b/drivers/media/video/mt20xx.h
@@ -29,7 +29,7 @@ static inline struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
                                             struct i2c_adapter* i2c_adap,
                                             u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 2ea133e8a625ce4a488b23be190ef80032ed0e19..3fb5f63df1e6392e000cd7e3b94180e5bec2705d 100644 (file)
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -123,7 +123,7 @@ static int mt9m001_init(struct soc_camera_device *icd)
        int ret;
 
        /* Disable chip, synchronous option update */
-       dev_dbg(icd->vdev->dev, "%s\n", __FUNCTION__);
+       dev_dbg(icd->vdev->dev, "%s\n", __func__);
 
        ret = reg_write(icd, MT9M001_RESET, 1);
        if (ret >= 0)

diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 18c64222dd11f7f4a38bab979165085e2863bf2f..1010e51189b77bd3f6d2970bd69111659e84e51a 100644 (file)
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -12,7 +12,7 @@
 #ifdef OV511_DEBUG
        #define PDEBUG(level, fmt, args...) \
                if (debug >= (level)) info("[%s:%d] " fmt, \
-               __FUNCTION__, __LINE__ , ## args)
+               __func__, __LINE__ , ## args)
 #else
        #define PDEBUG(level, fmt, args...) do {} while(0)
 #endif

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index bef3c9c7902aae4b8ed5ec7f1835aea216999ab6..936db67a5b0ff9bc11c78e6dd697e42124b11281 100644 (file)
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -148,7 +148,7 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
 
        BUG_ON(in_interrupt());
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __FUNCTION__,
+       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                &buf->vb, buf->vb.baddr, buf->vb.bsize);
 
        /* This waits until this buffer is out of danger, i.e., until it is no
@@ -175,7 +175,7 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
        struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
        int i, ret;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __FUNCTION__,
+       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /* Added list head initialization on alloc */
@@ -281,7 +281,7 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq,
        int nents = dma->sglen;
        unsigned long flags;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __FUNCTION__,
+       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
        spin_lock_irqsave(&pcdev->lock, flags);
 
@@ -354,21 +354,21 @@ static void pxa_videobuf_release(struct videobuf_queue *vq,
 #ifdef DEBUG
        struct soc_camera_device *icd = vq->priv_data;
 
-       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __FUNCTION__,
+       dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        switch (vb->state) {
        case VIDEOBUF_ACTIVE:
-               dev_dbg(&icd->dev, "%s (active)\n", __FUNCTION__);
+               dev_dbg(&icd->dev, "%s (active)\n", __func__);
                break;
        case VIDEOBUF_QUEUED:
-               dev_dbg(&icd->dev, "%s (queued)\n", __FUNCTION__);
+               dev_dbg(&icd->dev, "%s (queued)\n", __func__);
                break;
        case VIDEOBUF_PREPARED:
-               dev_dbg(&icd->dev, "%s (prepared)\n", __FUNCTION__);
+               dev_dbg(&icd->dev, "%s (prepared)\n", __func__);
                break;
        default:
-               dev_dbg(&icd->dev, "%s (unknown)\n", __FUNCTION__);
+               dev_dbg(&icd->dev, "%s (unknown)\n", __func__);
                break;
        }
 #endif
@@ -408,7 +408,7 @@ static void pxa_camera_dma_irq_y(int channel, void *data)
        vb = &pcdev->active->vb;
        buf = container_of(vb, struct pxa_buffer, vb);
        WARN_ON(buf->inwork || list_empty(&vb->queue));
-       dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%08lx %d\n", __FUNCTION__,
+       dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                vb, vb->baddr, vb->bsize);
 
        /* _init is used to debug races, see comment in pxa_camera_reqbufs() */
@@ -466,18 +466,18 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
                pcdev, pdata);
 
        if (pdata && pdata->init) {
-               dev_dbg(pcdev->dev, "%s: Init gpios\n", __FUNCTION__);
+               dev_dbg(pcdev->dev, "%s: Init gpios\n", __func__);
                pdata->init(pcdev->dev);
        }
 
        if (pdata && pdata->power) {
-               dev_dbg(pcdev->dev, "%s: Power on camera\n", __FUNCTION__);
+               dev_dbg(pcdev->dev, "%s: Power on camera\n", __func__);
                pdata->power(pcdev->dev, 1);
        }
 
        if (pdata && pdata->reset) {
                dev_dbg(pcdev->dev, "%s: Releasing camera reset\n",
-                       __FUNCTION__);
+                       __func__);
                pdata->reset(pcdev->dev, 1);
        }
 
@@ -507,12 +507,12 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
 
        if (board && board->reset) {
                dev_dbg(pcdev->dev, "%s: Asserting camera reset\n",
-                       __FUNCTION__);
+                       __func__);
                board->reset(pcdev->dev, 0);
        }
 
        if (board && board->power) {
-               dev_dbg(pcdev->dev, "%s: Power off camera\n", __FUNCTION__);
+               dev_dbg(pcdev->dev, "%s: Power off camera\n", __func__);
                board->power(pcdev->dev, 0);
        }
 }

diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 7b8cd30437c3d4806144a2f09584fb1925529ad1..1cd629380f7183c94882fca69c1f4a4e85c67784 100644 (file)
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -300,10 +300,10 @@ static void se401_button_irq(struct urb *urb)
        case -ENOENT:
        case -ESHUTDOWN:
                /* this urb is terminated, clean up */
-               dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+               dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                return;
        default:
-               dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+               dbg("%s - nonzero urb status received: %d", __func__, urb->status);
                goto exit;
        }
 
@@ -315,7 +315,7 @@ exit:
        status = usb_submit_urb (urb, GFP_ATOMIC);
        if (status)
                err ("%s - usb_submit_urb failed with result %d",
-                    __FUNCTION__, status);
+                    __func__, status);
 }
 
 static void se401_video_irq(struct urb *urb)

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 1e921578804fec7262a85a112b2130eb665f096e..91a1251d904dc56bde7aa7834611f4261e7844d4 100644 (file)
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -137,7 +137,7 @@ static int soc_camera_reqbufs(struct file *file, void *priv,
 
        WARN_ON(priv != file->private_data);
 
-       dev_dbg(&icd->dev, "%s: %d\n", __FUNCTION__, p->memory);
+       dev_dbg(&icd->dev, "%s: %d\n", __func__, p->memory);
 
        ret = videobuf_reqbufs(&icf->vb_vidq, p);
        if (ret < 0)
@@ -453,7 +453,7 @@ static int soc_camera_streamon(struct file *file, void *priv,
 
        WARN_ON(priv != file->private_data);
 
-       dev_dbg(&icd->dev, "%s\n", __FUNCTION__);
+       dev_dbg(&icd->dev, "%s\n", __func__);
 
        if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -472,7 +472,7 @@ static int soc_camera_streamoff(struct file *file, void *priv,
 
        WARN_ON(priv != file->private_data);
 
-       dev_dbg(&icd->dev, "%s\n", __FUNCTION__);
+       dev_dbg(&icd->dev, "%s\n", __func__);
 
        if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -985,7 +985,7 @@ void soc_camera_video_stop(struct soc_camera_device *icd)
 {
        struct video_device *vdev = icd->vdev;
 
-       dev_dbg(&icd->dev, "%s\n", __FUNCTION__);
+       dev_dbg(&icd->dev, "%s\n", __func__);
 
        if (!icd->dev.parent || !vdev)
                return;

diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index d2bf54194b63b69242ab2dd6b9cd2bd4e1f65b60..9276ed99738839075615554ff384e5afd285815b 100644 (file)
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1100,7 +1100,7 @@ static int stk_setup_format(struct stk_camera *dev)
                        && i < ARRAY_SIZE(stk_sizes))
                i++;
        if (i == ARRAY_SIZE(stk_sizes)) {
-               STK_ERROR("Something is broken in %s\n", __FUNCTION__);
+               STK_ERROR("Something is broken in %s\n", __func__);
                return -EFAULT;
        }
        /* This registers controls some timings, not sure of what. */

diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 78730294454e988716c7f9ba2f6f9b8cb1b45172..d7f130bedb5f47a05f6eddff87634e6af54d25c4 100644 (file)
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -83,7 +83,7 @@ static unsigned int debug;
 #define PDEBUG(level, fmt, args...) \
        do { \
        if (debug >= level)     \
-               info("[%s:%d] " fmt, __FUNCTION__, __LINE__ , ## args); \
+               info("[%s:%d] " fmt, __func__, __LINE__ , ## args);     \
        } while (0)
 
 

diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index fb895f6684a3cf31851323afa4ef5db03e84c762..6943b447a1bd7f4067e4a6f97a92c9e6d67ef83e 100644 (file)
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -906,7 +906,7 @@ static int __init tcm825x_init(void)
        rval = i2c_add_driver(&tcm825x_i2c_driver);
        if (rval)
                printk(KERN_INFO "%s: failed registering " TCM825X_NAME "\n",
-                      __FUNCTION__);
+                      __func__);
 
        return rval;
 }

diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 89afb19c9468e91c5fc9f173e3675b0ac36d4c38..0ebb5b525e576da86f021b74b669f5493e4886db 100644 (file)
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -363,7 +363,7 @@ static void tda8295_set_params(struct dvb_frontend *fe,
 
        set_audio(fe, params);
 
-       tuner_dbg("%s: freq = %d\n", __FUNCTION__, params->frequency);
+       tuner_dbg("%s: freq = %d\n", __func__, params->frequency);
 
        tda8295_power(fe, 1);
        tda8295_agc1_out(fe, 1);
@@ -613,7 +613,7 @@ static int tda8290_probe(struct tuner_i2c_props *i2c_props)
        if (tda8290_id[1] == TDA8290_ID) {
                if (debug)
                        printk(KERN_DEBUG "%s: tda8290 detected @ %d-%04x\n",
-                              __FUNCTION__, i2c_adapter_id(i2c_props->adap),
+                              __func__, i2c_adapter_id(i2c_props->adap),
                               i2c_props->addr);
                return 0;
        }
@@ -633,7 +633,7 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props)
        if (tda8295_id[1] == TDA8295_ID) {
                if (debug)
                        printk(KERN_DEBUG "%s: tda8295 detected @ %d-%04x\n",
-                              __FUNCTION__, i2c_adapter_id(i2c_props->adap),
+                              __func__, i2c_adapter_id(i2c_props->adap),
                               i2c_props->addr);
                return 0;
        }

diff --git a/drivers/media/video/tda8290.h b/drivers/media/video/tda8290.h
index 9dd8b73eb8c60cf082de9908059911ec6f088fd9..d3bbf276a469165354e82770764feec9d619bec6 100644 (file)
--- a/drivers/media/video/tda8290.h
+++ b/drivers/media/video/tda8290.h
@@ -39,7 +39,7 @@ extern struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
 #else
 static inline int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return -EINVAL;
 }
 
@@ -49,7 +49,7 @@ static inline struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
                                                  struct tda829x_config *cfg)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
+              __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 269761ce84a5c3fb0a5a5c90a1f2b7d4de5b3b15..0cee00242782bb0ec16a0736b822d43370cd9624 100644 (file)
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -35,7 +35,7 @@ static int debug;             /* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-           do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+           do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
 
 #define        SWITCH          0x00
 #define        LEVEL_ADJUST    0x02

diff --git a/drivers/media/video/tda9887.h b/drivers/media/video/tda9887.h
index 8f873a8e6ed20ef80b16ff2dfe4bdf4809be33ab..be49dcbfc70e1473056823b24e7a7f0d7bec56d2 100644 (file)
--- a/drivers/media/video/tda9887.h
+++ b/drivers/media/video/tda9887.h
@@ -30,7 +30,7 @@ static inline struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
                                                  struct i2c_adapter *i2c_adap,
                                                  u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/tea5761.h b/drivers/media/video/tea5761.h
index 73a03b427843f4466a3043c68eb6dc14a36a1b2b..8eb62722b9885f7d4253200a128401b416736c65 100644 (file)
--- a/drivers/media/video/tea5761.h
+++ b/drivers/media/video/tea5761.h
@@ -31,7 +31,7 @@ static inline int tea5761_autodetection(struct i2c_adapter* i2c_adap,
                                        u8 i2c_addr)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
+              __func__);
        return -EINVAL;
 }
 
@@ -39,7 +39,7 @@ static inline struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
                                                   struct i2c_adapter* i2c_adap,
                                                   u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/tea5767.h b/drivers/media/video/tea5767.h
index a44451f6114544ea689afa716cae716d559f47bf..7b547c092e25215bbd81505b8635c7ec907611bc 100644 (file)
--- a/drivers/media/video/tea5767.h
+++ b/drivers/media/video/tea5767.h
@@ -50,7 +50,7 @@ static inline int tea5767_autodetection(struct i2c_adapter* i2c_adap,
                                        u8 i2c_addr)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
+              __func__);
        return -EINVAL;
 }
 
@@ -58,7 +58,7 @@ static inline struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
                                                   struct i2c_adapter* i2c_adap,
                                                   u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index f22620e1872ee0354c2605b78c2b2ad1e890a5c5..9513d8611e8781431db6306fb5a2c8645df19817 100644 (file)
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -37,7 +37,7 @@ static int debug;             /* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-           do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+           do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
 
 #define TEA6415C_NUM_INPUTS    8
 #define TEA6415C_NUM_OUTPUTS   6

diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index dc0f0405f4c98c51020078e2dbd0fea4b8d10463..7fd53367c07caef877db4d21b55dbfc8d6355147 100644 (file)
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -37,7 +37,7 @@ static int debug;             /* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-           do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+           do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };

diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 8d6d2c803f9248343008883a59c6f12aaade99eb..be8d903171b7dce5f3ace750c63177a86d107284 100644 (file)
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -999,7 +999,7 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
 
        if (type >= tuner_count) {
                printk(KERN_WARNING "%s: invalid tuner type: %d (max: %d)\n",
-                      __FUNCTION__, type, tuner_count-1);
+                      __func__, type, tuner_count-1);
                return NULL;
        }
 

diff --git a/drivers/media/video/tuner-simple.h b/drivers/media/video/tuner-simple.h
index bf425f325f87b7dd9a1d37bad5d17ecd13bd4011..e46cf0121e030a23e314190116567550f9c7ff7e 100644 (file)
--- a/drivers/media/video/tuner-simple.h
+++ b/drivers/media/video/tuner-simple.h
@@ -31,7 +31,7 @@ static inline struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
                                                       u8 i2c_addr,
                                                       unsigned int type)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index 098a9956a2bce908a777b1ab05872b87e124f9b2..62b5de231e0dfa98435e04cb0753a5e0b415c17c 100644 (file)
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -135,7 +135,7 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
        unsigned char buf[2];
        unsigned char ibuf[2];
 
-       tuner_dbg("%s %04x called\n", __FUNCTION__, reg);
+       tuner_dbg("%s %04x called\n", __func__, reg);
 
        buf[0] = reg >> 8;
        buf[1] = (unsigned char) reg;
@@ -260,7 +260,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
        char                  name[33];
        char                  *fname;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        if (!firmware_name[0])
                fname = priv->ctrl.fname;
@@ -405,7 +405,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
        int                 i, best_i = -1, best_nr_matches = 0;
        unsigned int        ign_firm_type_mask = 0;
 
-       tuner_dbg("%s called, want type=", __FUNCTION__);
+       tuner_dbg("%s called, want type=", __func__);
        if (debug) {
                dump_firm_type(type);
                printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
@@ -491,7 +491,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
        int                pos, rc;
        unsigned char      *p, *endp, buf[priv->ctrl.max_len];
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        pos = seek_firmware(fe, type, id);
        if (pos < 0)
@@ -594,7 +594,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
        int                pos, rc;
        unsigned char      *p;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        if (!int_freq) {
                pos = seek_firmware(fe, type, id);
@@ -658,7 +658,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
        u16                        version, hwmodel;
        v4l2_std_id                std0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        if (!priv->firm) {
                if (!priv->ctrl.fname) {
@@ -832,7 +832,7 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
        u16                 frq_lock, signal = 0;
        int                 rc;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        mutex_lock(&priv->lock);
 
@@ -869,7 +869,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
        unsigned char      buf[4];
        u32                div, offset = 0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        mutex_lock(&priv->lock);
 
@@ -952,7 +952,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
        struct xc2028_data *priv = fe->tuner_priv;
        unsigned int       type=0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        if (p->mode == V4L2_TUNER_RADIO) {
                type |= FM;
@@ -985,7 +985,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
        fe_bandwidth_t     bw = BANDWIDTH_8_MHZ;
        u16                demod = 0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        if (priv->ctrl.d2633)
                type |= D2633;
@@ -1055,7 +1055,7 @@ static int xc2028_sleep(struct dvb_frontend *fe)
        struct xc2028_data *priv = fe->tuner_priv;
        int rc = 0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        mutex_lock(&priv->lock);
 
@@ -1076,7 +1076,7 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
 {
        struct xc2028_data *priv = fe->tuner_priv;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        mutex_lock(&xc2028_list_mutex);
 
@@ -1101,7 +1101,7 @@ static int xc2028_get_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
        struct xc2028_data *priv = fe->tuner_priv;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        *frequency = priv->frequency;
 
@@ -1114,7 +1114,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
        struct xc2028_ctrl *p    = priv_cfg;
        int                 rc   = 0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called\n", __func__);
 
        mutex_lock(&priv->lock);
 

diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
index 3eb8420379a42e29f108b65630082a7f1546366e..612e490634d03ac741a5a0b85faa30bbec295efd 100644 (file)
--- a/drivers/media/video/tuner-xc2028.h
+++ b/drivers/media/video/tuner-xc2028.h
@@ -55,7 +55,7 @@ static inline struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                                                 struct xc2028_config *cfg)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
+              __func__);
        return NULL;
 }
 #endif

diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 3ab556093ca70d63adc210eb7f2058f4d26fda98..37ddbed8e167318d4cc30607c3f834f4bb71928f 100644 (file)
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -970,7 +970,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
 
        MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
-       dprintk(2, "%s\n", __FUNCTION__);
+       dprintk(2, "%s\n", __func__);
        mutex_lock(&q->vb_lock);
        retval = -EBUSY;
        if (q->streaming)

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index e6ce99ff7fd1caa8d29025676f620360c95cd3c5..440c1a8e9c1ffc5ffa348b6783cb5b5570de80e0 100644 (file)
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -252,7 +252,7 @@ int videobuf_dma_map(struct videobuf_queue* q, struct videobuf_dmabuf *dma)
                                        dma->nr_pages, dma->direction);
                if (0 == dma->sglen) {
                        printk(KERN_WARNING
-                              "%s: videobuf_map_sg failed\n",__FUNCTION__);
+                              "%s: videobuf_map_sg failed\n",__func__);
                        kfree(dma->sglist);
                        dma->sglist = NULL;
                        dma->sglen = 0;
@@ -430,7 +430,7 @@ static void *__videobuf_alloc(size_t size)
        videobuf_dma_init(&mem->dma);
 
        dprintk(1,"%s: allocated at %p(%ld+%ld) & %p(%ld)\n",
-               __FUNCTION__,vb,(long)sizeof(*vb),(long)size-sizeof(*vb),
+               __func__,vb,(long)sizeof(*vb),(long)size-sizeof(*vb),
                mem,(long)sizeof(*mem));
 
        return vb;

diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index e23335f2919d292bef947e4b331a8129f7d0089b..9eb7982988a6f2f918291e0e0e692aa760283309 100644 (file)
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -114,7 +114,7 @@ static void *__videobuf_alloc(size_t size)
        mem->magic=MAGIC_VMAL_MEM;
 
        dprintk(1,"%s: allocated at %p(%ld+%ld) & %p(%ld)\n",
-               __FUNCTION__,vb,(long)sizeof(*vb),(long)size-sizeof(*vb),
+               __func__,vb,(long)sizeof(*vb),(long)size-sizeof(*vb),
                mem,(long)sizeof(*mem));
 
        return vb;

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 0d9b63762a48fd42aaaad60054d2a961dd1e83af..0bf056622d6a89449f28ed2cbf3fb03d761c8d1b 100644 (file)
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -2019,7 +2019,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
                        break;
                default:
                        printk(KERN_ERR "%s called with unknown type: %d\n",
-                              __FUNCTION__, type);
+                              __func__, type);
                        return -1;
        }
 
@@ -2057,7 +2057,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
        ret = device_register(&vfd->class_dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: device_register failed\n",
-                      __FUNCTION__);
+                      __func__);
                goto fail_minor;
        }
 

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 8353deb8a1d4b667b6764d430d1ae46013cf2e32..17eb3ec5d704748ae9ea01264037a8601346b313 100644 (file)
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -426,7 +426,7 @@ static void vivi_sleep(struct vivi_fh *fh)
        int timeout;
        DECLARE_WAITQUEUE(wait, current);
 
-       dprintk(dev, 1, "%s dma_q=0x%08lx\n", __FUNCTION__,
+       dprintk(dev, 1, "%s dma_q=0x%08lx\n", __func__,
                (unsigned long)dma_q);
 
        add_wait_queue(&dma_q->wq, &wait);
@@ -472,7 +472,7 @@ static int vivi_start_thread(struct vivi_fh *fh)
        dma_q->frame = 0;
        dma_q->ini_jiffies = jiffies;
 
-       dprintk(dev, 1, "%s\n", __FUNCTION__);
+       dprintk(dev, 1, "%s\n", __func__);
 
        dma_q->kthread = kthread_run(vivi_thread, fh, "vivi");
 
@@ -483,7 +483,7 @@ static int vivi_start_thread(struct vivi_fh *fh)
        /* Wakes thread */
        wake_up_interruptible(&dma_q->wq);
 
-       dprintk(dev, 1, "returning from %s\n", __FUNCTION__);
+       dprintk(dev, 1, "returning from %s\n", __func__);
        return 0;
 }
 
@@ -491,7 +491,7 @@ static void vivi_stop_thread(struct vivi_dmaqueue  *dma_q)
 {
        struct vivi_dev *dev = container_of(dma_q, struct vivi_dev, vidq);
 
-       dprintk(dev, 1, "%s\n", __FUNCTION__);
+       dprintk(dev, 1, "%s\n", __func__);
        /* shutdown control thread */
        if (dma_q->kthread) {
                kthread_stop(dma_q->kthread);
@@ -516,7 +516,7 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
        while (*size * *count > vid_limit * 1024 * 1024)
                (*count)--;
 
-       dprintk(dev, 1, "%s, count=%d, size=%d\n", __FUNCTION__,
+       dprintk(dev, 1, "%s, count=%d, size=%d\n", __func__,
                *count, *size);
 
        return 0;
@@ -527,7 +527,7 @@ static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
        struct vivi_fh  *fh = vq->priv_data;
        struct vivi_dev *dev  = fh->dev;
 
-       dprintk(dev, 1, "%s, state: %i\n", __FUNCTION__, buf->vb.state);
+       dprintk(dev, 1, "%s, state: %i\n", __func__, buf->vb.state);
 
        if (in_interrupt())
                BUG();
@@ -548,7 +548,7 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
        struct vivi_buffer *buf = container_of(vb, struct vivi_buffer, vb);
        int rc;
 
-       dprintk(dev, 1, "%s, field=%d\n", __FUNCTION__, field);
+       dprintk(dev, 1, "%s, field=%d\n", __func__, field);
 
        BUG_ON(NULL == fh->fmt);
 
@@ -589,7 +589,7 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
        struct vivi_dev       *dev  = fh->dev;
        struct vivi_dmaqueue *vidq = &dev->vidq;
 
-       dprintk(dev, 1, "%s\n", __FUNCTION__);
+       dprintk(dev, 1, "%s\n", __func__);
 
        buf->vb.state = VIDEOBUF_QUEUED;
        list_add_tail(&buf->vb.queue, &vidq->active);
@@ -602,7 +602,7 @@ static void buffer_release(struct videobuf_queue *vq,
        struct vivi_fh       *fh   = vq->priv_data;
        struct vivi_dev      *dev  = (struct vivi_dev *)fh->dev;
 
-       dprintk(dev, 1, "%s\n", __FUNCTION__);
+       dprintk(dev, 1, "%s\n", __func__);
 
        free_buffer(vq, buf);
 }
@@ -718,7 +718,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
        mutex_lock(&q->vb_lock);
 
        if (videobuf_queue_is_busy(&fh->vb_vidq)) {
-               dprintk(fh->dev, 1, "%s queue busy\n", __FUNCTION__);
+               dprintk(fh->dev, 1, "%s queue busy\n", __func__);
                ret = -EBUSY;
                goto out;
        }
@@ -974,7 +974,7 @@ vivi_poll(struct file *file, struct poll_table_struct *wait)
        struct vivi_dev       *dev = fh->dev;
        struct videobuf_queue *q = &fh->vb_vidq;
 
-       dprintk(dev, 1, "%s\n", __FUNCTION__);
+       dprintk(dev, 1, "%s\n", __func__);
 
        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
                return POLLERR;

diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index cdb396d9203c151a7ce2470dff46c73a07180e1f..33f702698a56f06d629bceb96bef454661282855 100644 (file)
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -64,7 +64,7 @@
 /*#define DEBUG*/                              /* Undef me for production */
 
 #ifdef DEBUG
-#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__ , ##a)
+#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __func__ , ##a)
 #else
 #define DPRINTF(x...)
 #endif

diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h
index ec7696e8f1fac3eaf3b47725c37db3ec1dde8154..3c95316bc030cf7dcbcfea1023a4cc5b5426eec7 100644 (file)
--- a/drivers/media/video/w9968cf.h
+++ b/drivers/media/video/w9968cf.h
@@ -298,7 +298,7 @@ struct w9968cf_device {
                        dev_warn(&cam->dev, fmt "\n", ## args);               \
                else if ((level) >= 5)                                        \
                        dev_info(&cam->dev, "[%s:%d] " fmt "\n",              \
-                                __FUNCTION__, __LINE__ , ## args);           \
+                                __func__, __LINE__ , ## args);           \
        }                                                                     \
 }
 /* For generic kernel (not device specific) messages */
@@ -309,7 +309,7 @@ struct w9968cf_device {
                if ((level) >= 1 && (level) <= 4)                             \
                        pr_info("w9968cf: " fmt "\n", ## args);               \
                else if ((level) >= 5)                                        \
-                       pr_debug("w9968cf: [%s:%d] " fmt "\n", __FUNCTION__,  \
+                       pr_debug("w9968cf: [%s:%d] " fmt "\n", __func__,  \
                                 __LINE__ , ## args);                         \
        }                                                                     \
 }
@@ -321,7 +321,7 @@ struct w9968cf_device {
 
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
-dev_info(&cam->dev, "[%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args);
+dev_info(&cam->dev, "[%s:%d] " fmt "\n", __func__, __LINE__ , ## args);
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0); /* nothing: it's a placeholder */

diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 8c0a379071e5baf8e9d8c28ace319a2c42ab2f32..1a002eaeb06c8f5ee3385b01f3552c1a02d97cfa 100644 (file)
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -4247,7 +4247,7 @@ zoran_poll (struct file *file,
                dprintk(3,
                        KERN_DEBUG
                        "%s: %s() raw - active=%c, sync_tail=%lu/%c, pend_tail=%lu, pend_head=%lu\n",
-                       ZR_DEVNAME(zr), __FUNCTION__,
+                       ZR_DEVNAME(zr), __func__,
                        "FAL"[fh->v4l_buffers.active], zr->v4l_sync_tail,
                        "UPMD"[zr->v4l_buffers.buffer[frame].state],
                        zr->v4l_pend_tail, zr->v4l_pend_head);
@@ -4269,7 +4269,7 @@ zoran_poll (struct file *file,
                dprintk(3,
                        KERN_DEBUG
                        "%s: %s() jpg - active=%c, que_tail=%lu/%c, que_head=%lu, dma=%lu/%lu\n",
-                       ZR_DEVNAME(zr), __FUNCTION__,
+                       ZR_DEVNAME(zr), __func__,
                        "FAL"[fh->jpg_buffers.active], zr->jpg_que_tail,
                        "UPMD"[zr->jpg_buffers.buffer[frame].state],
                        zr->jpg_que_head, zr->jpg_dma_tail, zr->jpg_dma_head);