V4L/DVB (7515): media/dvb/ttpci replace remaining __FUNCTION__ occurrences (3ca7fc84) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/media/dvb/ttpci/av7110.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -359,7 +359,7 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir,
	{		{
	dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len);		dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len);
	if (saa7146_wait_for_debi_done(av7110->dev, 0)) {		if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
	printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __FUNCTION__);		printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
	return;		return;
	}		}

	@@ -497,7 +497,7 @@ static void gpioirq(unsigned long data)
	saa7146_read(av7110->dev, SSR));		saa7146_read(av7110->dev, SSR));

	if (saa7146_wait_for_debi_done(av7110->dev, 0)) {		if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
	printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __FUNCTION__);		printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
	BUG(); /* maybe we should try resetting the debi? */		BUG(); /* maybe we should try resetting the debi? */
	}		}

	@@ -827,7 +827,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
	if (ret != 0 \|\| handle >= 32) {		if (ret != 0 \|\| handle >= 32) {
	printk("dvb-ttpci: %s error buf %04x %04x %04x %04x "		printk("dvb-ttpci: %s error buf %04x %04x %04x %04x "
	"ret %d handle %04x\n",		"ret %d handle %04x\n",
	__FUNCTION__, buf[0], buf[1], buf[2], buf[3],		__func__, buf[0], buf[1], buf[2], buf[3],
	ret, handle);		ret, handle);
	dvbdmxfilter->hw_handle = 0xffff;		dvbdmxfilter->hw_handle = 0xffff;
	if (!ret)		if (!ret)
	@@ -854,7 +854,7 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
	handle = dvbdmxfilter->hw_handle;		handle = dvbdmxfilter->hw_handle;
	if (handle >= 32) {		if (handle >= 32) {
	printk("%s tried to stop invalid filter %04x, filter type = %x\n",		printk("%s tried to stop invalid filter %04x, filter type = %x\n",
	__FUNCTION__, handle, dvbdmxfilter->type);		__func__, handle, dvbdmxfilter->type);
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -867,7 +867,7 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
	if (ret != 0 \|\| answ[1] != handle) {		if (ret != 0 \|\| answ[1] != handle) {
	printk("dvb-ttpci: %s error cmd %04x %04x %04x ret %x "		printk("dvb-ttpci: %s error cmd %04x %04x %04x ret %x "
	"resp %04x %04x pid %d\n",		"resp %04x %04x pid %d\n",
	__FUNCTION__, buf[0], buf[1], buf[2], ret,		__func__, buf[0], buf[1], buf[2], ret,
	answ[0], answ[1], dvbdmxfilter->feed->pid);		answ[0], answ[1], dvbdmxfilter->feed->pid);
	if (!ret)		if (!ret)
	ret = -1;		ret = -1;
	@@ -1122,7 +1122,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,

	ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4);		ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4);
	if (ret) {		if (ret) {
	printk(KERN_ERR "%s: av7110_fw_request error\n", __FUNCTION__);		printk(KERN_ERR "%s: av7110_fw_request error\n", __func__);
	return ret;		return ret;
	}		}
	dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n",		dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n",

drivers/media/dvb/ttpci/av7110.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@
	extern int av7110_debug;		extern int av7110_debug;

	#define dprintk(level,args...) \		#define dprintk(level,args...) \
	do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __FUNCTION__); printk(args); } } while (0)		do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __func__); printk(args); } } while (0)

	#define MAXFILT 32		#define MAXFILT 32

drivers/media/dvb/ttpci/av7110_hw.c

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -53,11 +53,11 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config,
	struct saa7146_dev *dev = av7110->dev;		struct saa7146_dev *dev = av7110->dev;

	if (count <= 0 \|\| count > 32764) {		if (count <= 0 \|\| count > 32764) {
	printk("%s: invalid count %d\n", __FUNCTION__, count);		printk("%s: invalid count %d\n", __func__, count);
	return -1;		return -1;
	}		}
	if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {		if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
	printk("%s: wait_for_debi_done failed\n", __FUNCTION__);		printk("%s: wait_for_debi_done failed\n", __func__);
	return -1;		return -1;
	}		}
	saa7146_write(dev, DEBI_CONFIG, config);		saa7146_write(dev, DEBI_CONFIG, config);
	@@ -76,11 +76,11 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
	u32 result = 0;		u32 result = 0;

	if (count > 32764 \|\| count <= 0) {		if (count > 32764 \|\| count <= 0) {
	printk("%s: invalid count %d\n", __FUNCTION__, count);		printk("%s: invalid count %d\n", __func__, count);
	return 0;		return 0;
	}		}
	if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {		if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
	printk("%s: wait_for_debi_done #1 failed\n", __FUNCTION__);		printk("%s: wait_for_debi_done #1 failed\n", __func__);
	return 0;		return 0;
	}		}
	saa7146_write(dev, DEBI_AD, av7110->debi_bus);		saa7146_write(dev, DEBI_AD, av7110->debi_bus);
	@@ -91,7 +91,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
	if (count > 4)		if (count > 4)
	return count;		return count;
	if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {		if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
	printk("%s: wait_for_debi_done #2 failed\n", __FUNCTION__);		printk("%s: wait_for_debi_done #2 failed\n", __func__);
	return 0;		return 0;
	}		}

	@@ -332,7 +332,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "%s: timeout waiting for MSGSTATE %04x\n",		printk(KERN_ERR "%s: timeout waiting for MSGSTATE %04x\n",
	__FUNCTION__, stat & flags);		__func__, stat & flags);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	msleep(1);		msleep(1);
	@@ -362,7 +362,7 @@ static int __av7110_send_fw_cmd(struct av7110 av7110, u16 buf, int length)
	if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)		if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __FUNCTION__);		printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __func__);
	av7110->arm_errors++;		av7110->arm_errors++;
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	@@ -379,7 +379,7 @@ static int __av7110_send_fw_cmd(struct av7110 av7110, u16 buf, int length)
	if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)		if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);		printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __func__);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	msleep(1);		msleep(1);
	@@ -419,14 +419,14 @@ static int __av7110_send_fw_cmd(struct av7110 av7110, u16 buf, int length)
	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);		stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
	if (stat & flags[0]) {		if (stat & flags[0]) {
	printk(KERN_ERR "%s: %s QUEUE overflow\n",		printk(KERN_ERR "%s: %s QUEUE overflow\n",
	__FUNCTION__, type);		__func__, type);
	return -1;		return -1;
	}		}
	if ((stat & flags[1]) == 0)		if ((stat & flags[1]) == 0)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n",		printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n",
	__FUNCTION__, type);		__func__, type);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	msleep(1);		msleep(1);
	@@ -454,7 +454,7 @@ static int __av7110_send_fw_cmd(struct av7110 av7110, u16 buf, int length)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND %d to complete\n",		printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND %d to complete\n",
	__FUNCTION__, (buf[0] >> 8) & 0xff);		__func__, (buf[0] >> 8) & 0xff);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	msleep(1);		msleep(1);
	@@ -462,11 +462,11 @@ static int __av7110_send_fw_cmd(struct av7110 av7110, u16 buf, int length)

	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);		stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
	if (stat & GPMQOver) {		if (stat & GPMQOver) {
	printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __FUNCTION__);		printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __func__);
	return -ENOSPC;		return -ENOSPC;
	}		}
	else if (stat & OSDQOver) {		else if (stat & OSDQOver) {
	printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __FUNCTION__);		printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __func__);
	return -ENOSPC;		return -ENOSPC;
	}		}
	#endif		#endif
	@@ -491,7 +491,7 @@ static int av7110_send_fw_cmd(struct av7110 av7110, u16 buf, int length)
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	if (ret && ret!=-ERESTARTSYS)		if (ret && ret!=-ERESTARTSYS)
	printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",		printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",
	__FUNCTION__, ret);		__func__, ret);
	return ret;		return ret;
	}		}

	@@ -575,7 +575,7 @@ int av7110_fw_request(struct av7110 av7110, u16 request_buf,
	if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)		if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);		printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	@@ -591,7 +591,7 @@ int av7110_fw_request(struct av7110 av7110, u16 request_buf,
	if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)		if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);		printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	@@ -602,12 +602,12 @@ int av7110_fw_request(struct av7110 av7110, u16 request_buf,
	#ifdef COM_DEBUG		#ifdef COM_DEBUG
	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);		stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
	if (stat & GPMQOver) {		if (stat & GPMQOver) {
	printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__);		printk(KERN_ERR "%s: GPMQOver\n", __func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -1;		return -1;
	}		}
	else if (stat & OSDQOver) {		else if (stat & OSDQOver) {
	printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__);		printk(KERN_ERR "%s: OSDQOver\n", __func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -1;		return -1;
	}		}
	@@ -741,7 +741,7 @@ static int FlushText(struct av7110 *av7110)
	break;		break;
	if (err) {		if (err) {
	printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",		printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
	__FUNCTION__);		__func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	@@ -768,7 +768,7 @@ static int WriteText(struct av7110 av7110, u8 win, u16 x, u16 y, char buf)
	break;		break;
	if (ret) {		if (ret) {
	printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",		printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
	__FUNCTION__);		__func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	@@ -782,7 +782,7 @@ static int WriteText(struct av7110 av7110, u8 win, u16 x, u16 y, char buf)
	break;		break;
	if (ret) {		if (ret) {
	printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",		printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
	__FUNCTION__);		__func__);
	mutex_unlock(&av7110->dcomlock);		mutex_unlock(&av7110->dcomlock);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}

drivers/media/dvb/ttpci/av7110_ir.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -133,7 +133,7 @@ static void av7110_emit_key(unsigned long parm)
	break;		break;

	default:		default:
	printk("%s invalid protocol %x\n", __FUNCTION__, ir->protocol);		printk("%s invalid protocol %x\n", __func__, ir->protocol);
	return;		return;
	}		}

	@@ -143,7 +143,7 @@ static void av7110_emit_key(unsigned long parm)
	keycode = ir->key_map[data];		keycode = ir->key_map[data];

	dprintk(16, "%s: code %08x -> addr %i data 0x%02x -> keycode %i\n",		dprintk(16, "%s: code %08x -> addr %i data 0x%02x -> keycode %i\n",
	__FUNCTION__, ircom, addr, data, keycode);		__func__, ircom, addr, data, keycode);

	/* check device address */		/* check device address */
	if (!(ir->device_mask & (1 << addr)))		if (!(ir->device_mask & (1 << addr)))
	@@ -151,7 +151,7 @@ static void av7110_emit_key(unsigned long parm)

	if (!keycode) {		if (!keycode) {
	printk ("%s: code %08x -> addr %i data 0x%02x -> unknown key!\n",		printk ("%s: code %08x -> addr %i data 0x%02x -> unknown key!\n",
	__FUNCTION__, ircom, addr, data);		__func__, ircom, addr, data);
	return;		return;
	}		}

drivers/media/dvb/ttpci/av7110_v4l.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -573,7 +573,7 @@ static int av7110_vbi_reset(struct inode inode, struct file file)
	struct saa7146_dev *dev = fh->dev;		struct saa7146_dev *dev = fh->dev;
	struct av7110 av7110 = (struct av7110) dev->ext_priv;		struct av7110 av7110 = (struct av7110) dev->ext_priv;

	dprintk(2, "%s\n", __FUNCTION__);		dprintk(2, "%s\n", __func__);
	av7110->wssMode = 0;		av7110->wssMode = 0;
	av7110->wssData = 0;		av7110->wssData = 0;
	if (FW_VERSION(av7110->arm_app) < 0x2623)		if (FW_VERSION(av7110->arm_app) < 0x2623)
	@@ -590,7 +590,7 @@ static ssize_t av7110_vbi_write(struct file file, const char __user data, size
	struct v4l2_sliced_vbi_data d;		struct v4l2_sliced_vbi_data d;
	int rc;		int rc;

	dprintk(2, "%s\n", __FUNCTION__);		dprintk(2, "%s\n", __func__);
	if (FW_VERSION(av7110->arm_app) < 0x2623 \|\| !av7110->wssMode \|\| count != sizeof d)		if (FW_VERSION(av7110->arm_app) < 0x2623 \|\| !av7110->wssMode \|\| count != sizeof d)
	return -EINVAL;		return -EINVAL;
	if (copy_from_user(&d, data, count))		if (copy_from_user(&d, data, count))