Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/video/cpia.h

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/media/video/cpia_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/media/video/ir-kbd-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/media/video/mt20xx.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/video/mt9m001.c

+1 −1
Original line number Diff line number Diff line
@@ -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)