Commit 7e28adb2 authored by Harvey Harrison's avatar Harvey Harrison Committed by Mauro Carvalho Chehab

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

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e9815cee
...@@ -412,11 +412,11 @@ void cpia_unregister_camera(struct cam_data *cam); ...@@ -412,11 +412,11 @@ void cpia_unregister_camera(struct cam_data *cam);
/* ErrorCode */ /* ErrorCode */
#define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */ #define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */
#define ALOG(fmt,args...) printk(fmt, ##args) #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_ #ifdef _CPIA_DEBUG_
#define ADBG(fmt,args...) printk(fmt, jiffies, ##args) #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 #else
#define DBG(fmn,args...) do {} while(0) #define DBG(fmn,args...) do {} while(0)
#endif #endif
......
...@@ -170,7 +170,7 @@ static void cpia_usb_complete(struct urb *urb) ...@@ -170,7 +170,7 @@ static void cpia_usb_complete(struct urb *urb)
/* resubmit */ /* resubmit */
urb->dev = ucpia->dev; urb->dev = ucpia->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0) 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) static int cpia_usb_open(void *privdata)
......
...@@ -153,7 +153,7 @@ static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) ...@@ -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) 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]); buf[0], buf[1], buf[2], buf[3]);
/* no key pressed or signal from other ir remote */ /* no key pressed or signal from other ir remote */
......
...@@ -29,7 +29,7 @@ static inline struct dvb_frontend *microtune_attach(struct dvb_frontend *fe, ...@@ -29,7 +29,7 @@ static inline struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
struct i2c_adapter* i2c_adap, struct i2c_adapter* i2c_adap,
u8 i2c_addr) 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; return NULL;
} }
#endif #endif
......
...@@ -123,7 +123,7 @@ static int mt9m001_init(struct soc_camera_device *icd) ...@@ -123,7 +123,7 @@ static int mt9m001_init(struct soc_camera_device *icd)
int ret; int ret;
/* Disable chip, synchronous option update */ /* 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); ret = reg_write(icd, MT9M001_RESET, 1);
if (ret >= 0) if (ret >= 0)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifdef OV511_DEBUG #ifdef OV511_DEBUG
#define PDEBUG(level, fmt, args...) \ #define PDEBUG(level, fmt, args...) \
if (debug >= (level)) info("[%s:%d] " fmt, \ if (debug >= (level)) info("[%s:%d] " fmt, \
__FUNCTION__, __LINE__ , ## args) __func__, __LINE__ , ## args)
#else #else
#define PDEBUG(level, fmt, args...) do {} while(0) #define PDEBUG(level, fmt, args...) do {} while(0)
#endif #endif
......
...@@ -148,7 +148,7 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf) ...@@ -148,7 +148,7 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
BUG_ON(in_interrupt()); 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); &buf->vb, buf->vb.baddr, buf->vb.bsize);
/* This waits until this buffer is out of danger, i.e., until it is no /* 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, ...@@ -175,7 +175,7 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb); struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
int i, ret; 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); vb, vb->baddr, vb->bsize);
/* Added list head initialization on alloc */ /* Added list head initialization on alloc */
...@@ -281,7 +281,7 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq, ...@@ -281,7 +281,7 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq,
int nents = dma->sglen; int nents = dma->sglen;
unsigned long flags; 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); vb, vb->baddr, vb->bsize);
spin_lock_irqsave(&pcdev->lock, flags); spin_lock_irqsave(&pcdev->lock, flags);
...@@ -354,21 +354,21 @@ static void pxa_videobuf_release(struct videobuf_queue *vq, ...@@ -354,21 +354,21 @@ static void pxa_videobuf_release(struct videobuf_queue *vq,
#ifdef DEBUG #ifdef DEBUG
struct soc_camera_device *icd = vq->priv_data; 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); vb, vb->baddr, vb->bsize);
switch (vb->state) { switch (vb->state) {
case VIDEOBUF_ACTIVE: case VIDEOBUF_ACTIVE:
dev_dbg(&icd->dev, "%s (active)\n", __FUNCTION__); dev_dbg(&icd->dev, "%s (active)\n", __func__);
break; break;
case VIDEOBUF_QUEUED: case VIDEOBUF_QUEUED:
dev_dbg(&icd->dev, "%s (queued)\n", __FUNCTION__); dev_dbg(&icd->dev, "%s (queued)\n", __func__);
break; break;
case VIDEOBUF_PREPARED: case VIDEOBUF_PREPARED:
dev_dbg(&icd->dev, "%s (prepared)\n", __FUNCTION__); dev_dbg(&icd->dev, "%s (prepared)\n", __func__);
break; break;
default: default:
dev_dbg(&icd->dev, "%s (unknown)\n", __FUNCTION__); dev_dbg(&icd->dev, "%s (unknown)\n", __func__);
break; break;
} }
#endif #endif
...@@ -408,7 +408,7 @@ static void pxa_camera_dma_irq_y(int channel, void *data) ...@@ -408,7 +408,7 @@ static void pxa_camera_dma_irq_y(int channel, void *data)
vb = &pcdev->active->vb; vb = &pcdev->active->vb;
buf = container_of(vb, struct pxa_buffer, vb); buf = container_of(vb, struct pxa_buffer, vb);
WARN_ON(buf->inwork || list_empty(&vb->queue)); 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); vb, vb->baddr, vb->bsize);
/* _init is used to debug races, see comment in pxa_camera_reqbufs() */ /* _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) ...@@ -466,18 +466,18 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
pcdev, pdata); pcdev, pdata);
if (pdata && pdata->init) { 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); pdata->init(pcdev->dev);
} }
if (pdata && pdata->power) { 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); pdata->power(pcdev->dev, 1);
} }
if (pdata && pdata->reset) { if (pdata && pdata->reset) {
dev_dbg(pcdev->dev, "%s: Releasing camera reset\n", dev_dbg(pcdev->dev, "%s: Releasing camera reset\n",
__FUNCTION__); __func__);
pdata->reset(pcdev->dev, 1); pdata->reset(pcdev->dev, 1);
} }
...@@ -507,12 +507,12 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev) ...@@ -507,12 +507,12 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
if (board && board->reset) { if (board && board->reset) {
dev_dbg(pcdev->dev, "%s: Asserting camera reset\n", dev_dbg(pcdev->dev, "%s: Asserting camera reset\n",
__FUNCTION__); __func__);
board->reset(pcdev->dev, 0); board->reset(pcdev->dev, 0);
} }
if (board && board->power) { 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); board->power(pcdev->dev, 0);
} }
} }
......
...@@ -300,10 +300,10 @@ static void se401_button_irq(struct urb *urb) ...@@ -300,10 +300,10 @@ static void se401_button_irq(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* 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; return;
default: default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero urb status received: %d", __func__, urb->status);
goto exit; goto exit;
} }
...@@ -315,7 +315,7 @@ static void se401_button_irq(struct urb *urb) ...@@ -315,7 +315,7 @@ static void se401_button_irq(struct urb *urb)
status = usb_submit_urb (urb, GFP_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status) if (status)
err ("%s - usb_submit_urb failed with result %d", err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, status); __func__, status);
} }
static void se401_video_irq(struct urb *urb) static void se401_video_irq(struct urb *urb)
......
...@@ -137,7 +137,7 @@ static int soc_camera_reqbufs(struct file *file, void *priv, ...@@ -137,7 +137,7 @@ static int soc_camera_reqbufs(struct file *file, void *priv,
WARN_ON(priv != file->private_data); 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); ret = videobuf_reqbufs(&icf->vb_vidq, p);
if (ret < 0) if (ret < 0)
...@@ -453,7 +453,7 @@ static int soc_camera_streamon(struct file *file, void *priv, ...@@ -453,7 +453,7 @@ static int soc_camera_streamon(struct file *file, void *priv,
WARN_ON(priv != file->private_data); 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) if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
...@@ -472,7 +472,7 @@ static int soc_camera_streamoff(struct file *file, void *priv, ...@@ -472,7 +472,7 @@ static int soc_camera_streamoff(struct file *file, void *priv,
WARN_ON(priv != file->private_data); 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) if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
...@@ -985,7 +985,7 @@ void soc_camera_video_stop(struct soc_camera_device *icd) ...@@ -985,7 +985,7 @@ void soc_camera_video_stop(struct soc_camera_device *icd)
{ {
struct video_device *vdev = icd->vdev; 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) if (!icd->dev.parent || !vdev)
return; return;
......
...@@ -1100,7 +1100,7 @@ static int stk_setup_format(struct stk_camera *dev) ...@@ -1100,7 +1100,7 @@ static int stk_setup_format(struct stk_camera *dev)
&& i < ARRAY_SIZE(stk_sizes)) && i < ARRAY_SIZE(stk_sizes))
i++; i++;
if (i == ARRAY_SIZE(stk_sizes)) { 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; return -EFAULT;
} }
/* This registers controls some timings, not sure of what. */ /* This registers controls some timings, not sure of what. */
......
...@@ -83,7 +83,7 @@ static unsigned int debug; ...@@ -83,7 +83,7 @@ static unsigned int debug;
#define PDEBUG(level, fmt, args...) \ #define PDEBUG(level, fmt, args...) \
do { \ do { \
if (debug >= level) \ if (debug >= level) \
info("[%s:%d] " fmt, __FUNCTION__, __LINE__ , ## args); \ info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
} while (0) } while (0)
......
...@@ -906,7 +906,7 @@ static int __init tcm825x_init(void) ...@@ -906,7 +906,7 @@ static int __init tcm825x_init(void)
rval = i2c_add_driver(&tcm825x_i2c_driver); rval = i2c_add_driver(&tcm825x_i2c_driver);
if (rval) if (rval)
printk(KERN_INFO "%s: failed registering " TCM825X_NAME "\n", printk(KERN_INFO "%s: failed registering " TCM825X_NAME "\n",
__FUNCTION__); __func__);
return rval; return rval;
} }
......
...@@ -363,7 +363,7 @@ static void tda8295_set_params(struct dvb_frontend *fe, ...@@ -363,7 +363,7 @@ static void tda8295_set_params(struct dvb_frontend *fe,
set_audio(fe, params); 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_power(fe, 1);
tda8295_agc1_out(fe, 1); tda8295_agc1_out(fe, 1);
...@@ -613,7 +613,7 @@ static int tda8290_probe(struct tuner_i2c_props *i2c_props) ...@@ -613,7 +613,7 @@ static int tda8290_probe(struct tuner_i2c_props *i2c_props)
if (tda8290_id[1] == TDA8290_ID) { if (tda8290_id[1] == TDA8290_ID) {
if (debug) if (debug)
printk(KERN_DEBUG "%s: tda8290 detected @ %d-%04x\n", 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); i2c_props->addr);
return 0; return 0;
} }
...@@ -633,7 +633,7 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props) ...@@ -633,7 +633,7 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props)
if (tda8295_id[1] == TDA8295_ID) { if (tda8295_id[1] == TDA8295_ID) {
if (debug) if (debug)
printk(KERN_DEBUG "%s: tda8295 detected @ %d-%04x\n", 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); i2c_props->addr);
return 0; return 0;
} }
......
...@@ -39,7 +39,7 @@ extern struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, ...@@ -39,7 +39,7 @@ extern struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
#else #else
static inline int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr) 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; return -EINVAL;
} }
...@@ -49,7 +49,7 @@ static inline struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, ...@@ -49,7 +49,7 @@ static inline struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
struct tda829x_config *cfg) struct tda829x_config *cfg)
{ {
printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
__FUNCTION__); __func__);
return NULL; return NULL;
} }
#endif #endif
......
...@@ -35,7 +35,7 @@ static int debug; /* insmod parameter */ ...@@ -35,7 +35,7 @@ static int debug; /* insmod parameter */
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
#define dprintk(args...) \ #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 SWITCH 0x00
#define LEVEL_ADJUST 0x02 #define LEVEL_ADJUST 0x02
......
...@@ -30,7 +30,7 @@ static inline struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe, ...@@ -30,7 +30,7 @@ static inline struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c_adap, struct i2c_adapter *i2c_adap,
u8 i2c_addr) 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; return NULL;
} }
#endif #endif
......
...@@ -31,7 +31,7 @@ static inline int tea5761_autodetection(struct i2c_adapter* i2c_adap, ...@@ -31,7 +31,7 @@ static inline int tea5761_autodetection(struct i2c_adapter* i2c_adap,
u8 i2c_addr) u8 i2c_addr)
{ {
printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
__FUNCTION__); __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -39,7 +39,7 @@ static inline struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe, ...@@ -39,7 +39,7 @@ static inline struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
struct i2c_adapter* i2c_adap, struct i2c_adapter* i2c_adap,
u8 i2c_addr) 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; return NULL;
} }
#endif #endif
......
...@@ -50,7 +50,7 @@ static inline int tea5767_autodetection(struct i2c_adapter* i2c_adap, ...@@ -50,7 +50,7 @@ static inline int tea5767_autodetection(struct i2c_adapter* i2c_adap,
u8 i2c_addr) u8 i2c_addr)
{ {
printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
__FUNCTION__); __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -58,7 +58,7 @@ static inline struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe, ...@@ -58,7 +58,7 @@ static inline struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
struct i2c_adapter* i2c_adap, struct i2c_adapter* i2c_adap,
u8 i2c_addr) 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; return NULL;
} }
#endif #endif
......
...@@ -37,7 +37,7 @@ static int debug; /* insmod parameter */ ...@@ -37,7 +37,7 @@ static int debug; /* insmod parameter */
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
#define dprintk(args...) \ #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_INPUTS 8
#define TEA6415C_NUM_OUTPUTS 6 #define TEA6415C_NUM_OUTPUTS 6
......
...@@ -37,7 +37,7 @@ static int debug; /* insmod parameter */ ...@@ -37,7 +37,7 @@ static int debug; /* insmod parameter */
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
#define dprintk(args...) \ #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) */ /* 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 }; static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };
......
...@@ -999,7 +999,7 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe, ...@@ -999,7 +999,7 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
if (type >= tuner_count) { if (type >= tuner_count) {
printk(KERN_WARNING "%s: invalid tuner type: %d (max: %d)\n", printk(KERN_WARNING "%s: invalid tuner type: %d (max: %d)\n",
__FUNCTION__, type, tuner_count-1); __func__, type, tuner_count-1);
return NULL; return NULL;
} }
......
...@@ -31,7 +31,7 @@ static inline struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe, ...@@ -31,7 +31,7 @@ static inline struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
u8 i2c_addr, u8 i2c_addr,
unsigned int type) 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; return NULL;
} }
#endif #endif
......
...@@ -135,7 +135,7 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val) ...@@ -135,7 +135,7 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
unsigned char buf[2]; unsigned char buf[2];
unsigned char ibuf[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[0] = reg >> 8;
buf[1] = (unsigned char) reg; buf[1] = (unsigned char) reg;
...@@ -260,7 +260,7 @@ static int load_all_firmwares(struct dvb_frontend *fe) ...@@ -260,7 +260,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
char name[33]; char name[33];
char *fname; char *fname;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
if (!firmware_name[0]) if (!firmware_name[0])
fname = priv->ctrl.fname; fname = priv->ctrl.fname;
...@@ -405,7 +405,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -405,7 +405,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
int i, best_i = -1, best_nr_matches = 0; int i, best_i = -1, best_nr_matches = 0;
unsigned int ign_firm_type_mask = 0; unsigned int ign_firm_type_mask = 0;
tuner_dbg("%s called, want type=", __FUNCTION__); tuner_dbg("%s called, want type=", __func__);
if (debug) { if (debug) {
dump_firm_type(type); dump_firm_type(type);
printk("(%x), id %016llx.\n", type, (unsigned long long)*id); 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, ...@@ -491,7 +491,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
int pos, rc; int pos, rc;
unsigned char *p, *endp, buf[priv->ctrl.max_len]; 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); pos = seek_firmware(fe, type, id);
if (pos < 0) if (pos < 0)
...@@ -594,7 +594,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type, ...@@ -594,7 +594,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
int pos, rc; int pos, rc;
unsigned char *p; unsigned char *p;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
if (!int_freq) { if (!int_freq) {
pos = seek_firmware(fe, type, id); pos = seek_firmware(fe, type, id);
...@@ -658,7 +658,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -658,7 +658,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
u16 version, hwmodel; u16 version, hwmodel;
v4l2_std_id std0; v4l2_std_id std0;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
if (!priv->firm) { if (!priv->firm) {
if (!priv->ctrl.fname) { if (!priv->ctrl.fname) {
...@@ -832,7 +832,7 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength) ...@@ -832,7 +832,7 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
u16 frq_lock, signal = 0; u16 frq_lock, signal = 0;
int rc; int rc;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
...@@ -869,7 +869,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */, ...@@ -869,7 +869,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
unsigned char buf[4]; unsigned char buf[4];
u32 div, offset = 0; u32 div, offset = 0;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
...@@ -952,7 +952,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe, ...@@ -952,7 +952,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
struct xc2028_data *priv = fe->tuner_priv; struct xc2028_data *priv = fe->tuner_priv;
unsigned int type=0; unsigned int type=0;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
if (p->mode == V4L2_TUNER_RADIO) { if (p->mode == V4L2_TUNER_RADIO) {
type |= FM; type |= FM;
...@@ -985,7 +985,7 @@ static int xc2028_set_params(struct dvb_frontend *fe, ...@@ -985,7 +985,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
fe_bandwidth_t bw = BANDWIDTH_8_MHZ; fe_bandwidth_t bw = BANDWIDTH_8_MHZ;
u16 demod = 0; u16 demod = 0;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
if (priv->ctrl.d2633) if (priv->ctrl.d2633)
type |= D2633; type |= D2633;
...@@ -1055,7 +1055,7 @@ static int xc2028_sleep(struct dvb_frontend *fe) ...@@ -1055,7 +1055,7 @@ static int xc2028_sleep(struct dvb_frontend *fe)
struct xc2028_data *priv = fe->tuner_priv; struct xc2028_data *priv = fe->tuner_priv;
int rc = 0; int rc = 0;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
...@@ -1076,7 +1076,7 @@ static int xc2028_dvb_release(struct dvb_frontend *fe) ...@@ -1076,7 +1076,7 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
{ {
struct xc2028_data *priv = fe->tuner_priv; struct xc2028_data *priv = fe->tuner_priv;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
mutex_lock(&xc2028_list_mutex); mutex_lock(&xc2028_list_mutex);
...@@ -1101,7 +1101,7 @@ static int xc2028_get_frequency(struct dvb_frontend *fe, u32 *frequency) ...@@ -1101,7 +1101,7 @@ static int xc2028_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{ {
struct xc2028_data *priv = fe->tuner_priv; struct xc2028_data *priv = fe->tuner_priv;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
*frequency = priv->frequency; *frequency = priv->frequency;
...@@ -1114,7 +1114,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg) ...@@ -1114,7 +1114,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
struct xc2028_ctrl *p = priv_cfg; struct xc2028_ctrl *p = priv_cfg;
int rc = 0; int rc = 0;
tuner_dbg("%s called\n", __FUNCTION__); tuner_dbg("%s called\n", __func__);
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
......
...@@ -55,7 +55,7 @@ static inline struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe, ...@@ -55,7 +55,7 @@ static inline struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
struct xc2028_config *cfg) struct xc2028_config *cfg)
{ {
printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
__FUNCTION__); __func__);
return NULL; return NULL;
} }
#endif #endif
......
...@@ -970,7 +970,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q, ...@@ -970,7 +970,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS); MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
dprintk(2, "%s\n", __FUNCTION__); dprintk(2, "%s\n", __func__);
mutex_lock(&q->vb_lock); mutex_lock(&q->vb_lock);
retval = -EBUSY; retval = -EBUSY;
if (q->streaming) if (q->streaming)
......
...@@ -252,7 +252,7 @@ int videobuf_dma_map(struct videobuf_queue* q, struct videobuf_dmabuf *dma) ...@@ -252,7 +252,7 @@ int videobuf_dma_map(struct videobuf_queue* q, struct videobuf_dmabuf *dma)
dma->nr_pages, dma->direction); dma->nr_pages, dma->direction);
if (0 == dma->sglen) { if (0 == dma->sglen) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: videobuf_map_sg failed\n",__FUNCTION__); "%s: videobuf_map_sg failed\n",__func__);
kfree(dma->sglist); kfree(dma->sglist);
dma->sglist = NULL; dma->sglist = NULL;
dma->sglen = 0; dma->sglen = 0;
...@@ -430,7 +430,7 @@ static void *__videobuf_alloc(size_t size) ...@@ -430,7 +430,7 @@ static void *__videobuf_alloc(size_t size)
videobuf_dma_init(&mem->dma); videobuf_dma_init(&mem->dma);
dprintk(1,"%s: allocated at %p(%ld+%ld) & %p(%ld)\n", 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)); mem,(long)sizeof(*mem));
return vb; return vb;
......
...@@ -114,7 +114,7 @@ static void *__videobuf_alloc(size_t size) ...@@ -114,7 +114,7 @@ static void *__videobuf_alloc(size_t size)
mem->magic=MAGIC_VMAL_MEM; mem->magic=MAGIC_VMAL_MEM;
dprintk(1,"%s: allocated at %p(%ld+%ld) & %p(%ld)\n", 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)); mem,(long)sizeof(*mem));
return vb; return vb;
......
...@@ -2019,7 +2019,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) ...@@ -2019,7 +2019,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
break; break;
default: default:
printk(KERN_ERR "%s called with unknown type: %d\n", printk(KERN_ERR "%s called with unknown type: %d\n",
__FUNCTION__, type); __func__, type);
return -1; return -1;
} }
...@@ -2057,7 +2057,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) ...@@ -2057,7 +2057,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
ret = device_register(&vfd->class_dev); ret = device_register(&vfd->class_dev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "%s: device_register failed\n", printk(KERN_ERR "%s: device_register failed\n",
__FUNCTION__); __func__);
goto fail_minor; goto fail_minor;
} }
......
...@@ -426,7 +426,7 @@ static void vivi_sleep(struct vivi_fh *fh) ...@@ -426,7 +426,7 @@ static void vivi_sleep(struct vivi_fh *fh)
int timeout; int timeout;
DECLARE_WAITQUEUE(wait, current); 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); (unsigned long)dma_q);
add_wait_queue(&dma_q->wq, &wait); add_wait_queue(&dma_q->wq, &wait);
...@@ -472,7 +472,7 @@ static int vivi_start_thread(struct vivi_fh *fh) ...@@ -472,7 +472,7 @@ static int vivi_start_thread(struct vivi_fh *fh)
dma_q->frame = 0; dma_q->frame = 0;
dma_q->ini_jiffies = jiffies; 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"); dma_q->kthread = kthread_run(vivi_thread, fh, "vivi");
...@@ -483,7 +483,7 @@ static int vivi_start_thread(struct vivi_fh *fh) ...@@ -483,7 +483,7 @@ static int vivi_start_thread(struct vivi_fh *fh)
/* Wakes thread */ /* Wakes thread */
wake_up_interruptible(&dma_q->wq); wake_up_interruptible(&dma_q->wq);
dprintk(dev, 1, "returning from %s\n", __FUNCTION__); dprintk(dev, 1, "returning from %s\n", __func__);
return 0; return 0;
} }
...@@ -491,7 +491,7 @@ static void vivi_stop_thread(struct vivi_dmaqueue *dma_q) ...@@ -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); 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 */ /* shutdown control thread */
if (dma_q->kthread) { if (dma_q->kthread) {
kthread_stop(dma_q->kthread); kthread_stop(dma_q->kthread);
...@@ -516,7 +516,7 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size) ...@@ -516,7 +516,7 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
while (*size * *count > vid_limit * 1024 * 1024) while (*size * *count > vid_limit * 1024 * 1024)
(*count)--; (*count)--;
dprintk(dev, 1, "%s, count=%d, size=%d\n", __FUNCTION__, dprintk(dev, 1, "%s, count=%d, size=%d\n", __func__,
*count, *size); *count, *size);
return 0; return 0;
...@@ -527,7 +527,7 @@ static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf) ...@@ -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_fh *fh = vq->priv_data;
struct vivi_dev *dev = fh->dev; 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()) if (in_interrupt())
BUG(); BUG();
...@@ -548,7 +548,7 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb, ...@@ -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); struct vivi_buffer *buf = container_of(vb, struct vivi_buffer, vb);
int rc; 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); BUG_ON(NULL == fh->fmt);
...@@ -589,7 +589,7 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) ...@@ -589,7 +589,7 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
struct vivi_dev *dev = fh->dev; struct vivi_dev *dev = fh->dev;
struct vivi_dmaqueue *vidq = &dev->vidq; struct vivi_dmaqueue *vidq = &dev->vidq;
dprintk(dev, 1, "%s\n", __FUNCTION__); dprintk(dev, 1, "%s\n", __func__);
buf->vb.state = VIDEOBUF_QUEUED; buf->vb.state = VIDEOBUF_QUEUED;
list_add_tail(&buf->vb.queue, &vidq->active); list_add_tail(&buf->vb.queue, &vidq->active);
...@@ -602,7 +602,7 @@ static void buffer_release(struct videobuf_queue *vq, ...@@ -602,7 +602,7 @@ static void buffer_release(struct videobuf_queue *vq,
struct vivi_fh *fh = vq->priv_data; struct vivi_fh *fh = vq->priv_data;
struct vivi_dev *dev = (struct vivi_dev *)fh->dev; 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); free_buffer(vq, buf);
} }
...@@ -718,7 +718,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, ...@@ -718,7 +718,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
mutex_lock(&q->vb_lock); mutex_lock(&q->vb_lock);
if (videobuf_queue_is_busy(&fh->vb_vidq)) { 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; ret = -EBUSY;
goto out; goto out;
} }
...@@ -974,7 +974,7 @@ vivi_poll(struct file *file, struct poll_table_struct *wait) ...@@ -974,7 +974,7 @@ vivi_poll(struct file *file, struct poll_table_struct *wait)
struct vivi_dev *dev = fh->dev; struct vivi_dev *dev = fh->dev;
struct videobuf_queue *q = &fh->vb_vidq; 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) if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
return POLLERR; return POLLERR;
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
/*#define DEBUG*/ /* Undef me for production */ /*#define DEBUG*/ /* Undef me for production */
#ifdef DEBUG #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 #else
#define DPRINTF(x...) #define DPRINTF(x...)
#endif #endif
......
...@@ -298,7 +298,7 @@ struct w9968cf_device { ...@@ -298,7 +298,7 @@ struct w9968cf_device {
dev_warn(&cam->dev, fmt "\n", ## args); \ dev_warn(&cam->dev, fmt "\n", ## args); \
else if ((level) >= 5) \ else if ((level) >= 5) \
dev_info(&cam->dev, "[%s:%d] " fmt "\n", \ dev_info(&cam->dev, "[%s:%d] " fmt "\n", \
__FUNCTION__, __LINE__ , ## args); \ __func__, __LINE__ , ## args); \
} \ } \
} }
/* For generic kernel (not device specific) messages */ /* For generic kernel (not device specific) messages */
...@@ -309,7 +309,7 @@ struct w9968cf_device { ...@@ -309,7 +309,7 @@ struct w9968cf_device {
if ((level) >= 1 && (level) <= 4) \ if ((level) >= 1 && (level) <= 4) \
pr_info("w9968cf: " fmt "\n", ## args); \ pr_info("w9968cf: " fmt "\n", ## args); \
else if ((level) >= 5) \ else if ((level) >= 5) \
pr_debug("w9968cf: [%s:%d] " fmt "\n", __FUNCTION__, \ pr_debug("w9968cf: [%s:%d] " fmt "\n", __func__, \
__LINE__ , ## args); \ __LINE__ , ## args); \
} \ } \
} }
...@@ -321,7 +321,7 @@ struct w9968cf_device { ...@@ -321,7 +321,7 @@ struct w9968cf_device {
#undef PDBG #undef PDBG
#define PDBG(fmt, args...) \ #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 #undef PDBGG
#define PDBGG(fmt, args...) do {;} while(0); /* nothing: it's a placeholder */ #define PDBGG(fmt, args...) do {;} while(0); /* nothing: it's a placeholder */
......
...@@ -4247,7 +4247,7 @@ zoran_poll (struct file *file, ...@@ -4247,7 +4247,7 @@ zoran_poll (struct file *file,
dprintk(3, dprintk(3,
KERN_DEBUG KERN_DEBUG
"%s: %s() raw - active=%c, sync_tail=%lu/%c, pend_tail=%lu, pend_head=%lu\n", "%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, "FAL"[fh->v4l_buffers.active], zr->v4l_sync_tail,
"UPMD"[zr->v4l_buffers.buffer[frame].state], "UPMD"[zr->v4l_buffers.buffer[frame].state],
zr->v4l_pend_tail, zr->v4l_pend_head); zr->v4l_pend_tail, zr->v4l_pend_head);
...@@ -4269,7 +4269,7 @@ zoran_poll (struct file *file, ...@@ -4269,7 +4269,7 @@ zoran_poll (struct file *file,
dprintk(3, dprintk(3,
KERN_DEBUG KERN_DEBUG
"%s: %s() jpg - active=%c, que_tail=%lu/%c, que_head=%lu, dma=%lu/%lu\n", "%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, "FAL"[fh->jpg_buffers.active], zr->jpg_que_tail,
"UPMD"[zr->jpg_buffers.buffer[frame].state], "UPMD"[zr->jpg_buffers.buffer[frame].state],
zr->jpg_que_head, zr->jpg_dma_tail, zr->jpg_dma_head); zr->jpg_que_head, zr->jpg_dma_tail, zr->jpg_dma_head);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment