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

Commit 271ddbf7 authored by Harvey Harrison's avatar Harvey Harrison Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 708bebdd

drivers/media/dvb/frontends/bcm3510.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 
	if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {



		deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n",

			__FUNCTION__, state->config->demod_address, reg,  err);

			__func__, state->config->demod_address, reg,  err);

		return -EREMOTEIO;

	}
@@ -110,7 +110,7 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l 


	if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {

		deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n",

			__FUNCTION__, state->config->demod_address, reg,  err);

			__func__, state->config->demod_address, reg,  err);

		return -EREMOTEIO;

	}

	deb_i2c("i2c rd %02x: ",reg);

drivers/media/dvb/frontends/bcm3510.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config, 
static inline struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,

						  struct i2c_adapter* i2c)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return NULL;

}

#endif // CONFIG_DVB_BCM3510

drivers/media/dvb/frontends/cx22700.c

+6 −6
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ static int cx22700_writereg (struct cx22700_state* state, u8 reg, u8 data) 
	u8 buf [] = { reg, data };

	struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };



	dprintk ("%s\n", __FUNCTION__);

	dprintk ("%s\n", __func__);



	ret = i2c_transfer (state->i2c, &msg, 1);



	if (ret != 1)

		printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",

			__FUNCTION__, reg, data, ret);

			__func__, reg, data, ret);



	return (ret != 1) ? -1 : 0;

}
@@ -92,7 +92,7 @@ static int cx22700_readreg (struct cx22700_state* state, u8 reg) 
	struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },

			   { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };



	dprintk ("%s\n", __FUNCTION__);

	dprintk ("%s\n", __func__);



	ret = i2c_transfer (state->i2c, msg, 2);
@@ -105,7 +105,7 @@ static int cx22700_set_inversion (struct cx22700_state* state, int inversion) 
{

	u8 val;



	dprintk ("%s\n", __FUNCTION__);

	dprintk ("%s\n", __func__);



	switch (inversion) {

	case INVERSION_AUTO:
@@ -127,7 +127,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet 
	static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 };

	u8 val;



	dprintk ("%s\n", __FUNCTION__);

	dprintk ("%s\n", __func__);



	if (p->code_rate_HP < FEC_1_2 || p->code_rate_HP > FEC_7_8)

		return -EINVAL;
@@ -191,7 +191,7 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet 
						    FEC_5_6, FEC_7_8 };

	u8 val;



	dprintk ("%s\n", __FUNCTION__);

	dprintk ("%s\n", __func__);



	if (!(cx22700_readreg(state, 0x07) & 0x20))  /*  tps valid? */

		return -EAGAIN;

drivers/media/dvb/frontends/cx22700.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config, 
static inline struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,

					   struct i2c_adapter* i2c)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return NULL;

}

#endif // CONFIG_DVB_CX22700

drivers/media/dvb/frontends/cx22702.c

+12 −12
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data) 


	if (ret != 1)

		printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",

			__FUNCTION__, reg, data, ret);

			__func__, reg, data, ret);



	return (ret != 1) ? -1 : 0;

}
@@ -108,7 +108,7 @@ static u8 cx22702_readreg (struct cx22702_state* state, u8 reg) 
	ret = i2c_transfer(state->i2c, msg, 2);



	if (ret != 2)

		printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);

		printk("%s: readreg error (ret == %i)\n", __func__, ret);



	return b1[0];

}
@@ -195,7 +195,7 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet 
static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)

{

	struct cx22702_state* state = fe->demodulator_priv;

	dprintk ("%s(%d)\n", __FUNCTION__, enable);

	dprintk ("%s(%d)\n", __func__, enable);

	if (enable)

		return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe);

	else
@@ -228,7 +228,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		cx22702_writereg(state, 0x0C, cx22702_readreg(state, 0x0C) &0xcf );

		break;

	default:

		dprintk ("%s: invalid bandwidth\n",__FUNCTION__);

		dprintk ("%s: invalid bandwidth\n",__func__);

		return -EINVAL;

	}
@@ -250,7 +250,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc );

		cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );

		cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */

		dprintk("%s: Autodetecting\n",__FUNCTION__);

		dprintk("%s: Autodetecting\n",__func__);

		return 0;

	}
@@ -261,7 +261,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		case QAM_16: val = (val&0xe7)|0x08; break;

		case QAM_64: val = (val&0xe7)|0x10; break;

		default:

			dprintk ("%s: invalid constellation\n",__FUNCTION__);

			dprintk ("%s: invalid constellation\n",__func__);

			return -EINVAL;

	}

	switch(p->u.ofdm.hierarchy_information) {
@@ -270,7 +270,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		case    HIERARCHY_2: val = (val&0xf8)|2; break;

		case    HIERARCHY_4: val = (val&0xf8)|3; break;

		default:

			dprintk ("%s: invalid hierarchy\n",__FUNCTION__);

			dprintk ("%s: invalid hierarchy\n",__func__);

			return -EINVAL;

	}

	cx22702_writereg (state, 0x06, val);
@@ -284,7 +284,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		case FEC_5_6: val = (val&0xc7)|0x18; break;

		case FEC_7_8: val = (val&0xc7)|0x20; break;

		default:

			dprintk ("%s: invalid code_rate_HP\n",__FUNCTION__);

			dprintk ("%s: invalid code_rate_HP\n",__func__);

			return -EINVAL;

	}

	switch(p->u.ofdm.code_rate_LP) {
@@ -295,7 +295,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		case FEC_5_6: val = (val&0xf8)|3; break;

		case FEC_7_8: val = (val&0xf8)|4; break;

		default:

			dprintk ("%s: invalid code_rate_LP\n",__FUNCTION__);

			dprintk ("%s: invalid code_rate_LP\n",__func__);

			return -EINVAL;

	}

	cx22702_writereg (state, 0x07, val);
@@ -307,14 +307,14 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		case  GUARD_INTERVAL_1_8: val = (val&0xf3)|0x08; break;

		case  GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break;

		default:

			dprintk ("%s: invalid guard_interval\n",__FUNCTION__);

			dprintk ("%s: invalid guard_interval\n",__func__);

			return -EINVAL;

	}

	switch(p->u.ofdm.transmission_mode) {

		case TRANSMISSION_MODE_2K: val = (val&0xfc); break;

		case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break;

		default:

			dprintk ("%s: invalid transmission_mode\n",__FUNCTION__);

			dprintk ("%s: invalid transmission_mode\n",__func__);

			return -EINVAL;

	}

	cx22702_writereg(state, 0x08, val);
@@ -360,7 +360,7 @@ static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status) 
	reg23 = cx22702_readreg (state, 0x23);



	dprintk ("%s: status demod=0x%02x agc=0x%02x\n"

		,__FUNCTION__,reg0A,reg23);

		,__func__,reg0A,reg23);



	if(reg0A & 0x10) {

		*status |= FE_HAS_LOCK;