Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 92609
b: refs/heads/master
c: 7e28adb
h: refs/heads/master
i:
  92607: 6f79ec2
v: v3
  • Loading branch information
Harvey Harrison authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent be98bb8 commit fbf6177
Show file tree
Hide file tree
Showing 33 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9815ceea9733dfb236629f5b72f2e6486f66242
refs/heads/master: 7e28adb2497f6b873516163e2d29210c11777613
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/cpia.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/cpia_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/ir-kbd-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/mt20xx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/mt9m001.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/ov511.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions trunk/drivers/media/video/pxa_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 */
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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() */
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/se401.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -315,7 +315,7 @@ static void se401_button_irq(struct urb *urb)
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)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/media/video/soc_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/stk-webcam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/stv680.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tcm825x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/tda8290.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/tda8290.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tda9840.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tda9887.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/tea5761.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ 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;
}

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
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/tea5767.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ 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;
}

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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tea6415c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tea6420.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tuner-simple.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/tuner-simple.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit fbf6177

Please sign in to comment.