Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 283 additions and 283 deletions
drivers/media/dvb/frontends/bcm3510.c
View file @ 271ddbf7
...@@ -91,7 +91,7 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 ...@@ -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) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n", 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; return -EREMOTEIO;
} }
...@@ -110,7 +110,7 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l ...@@ -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) { if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n", 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; return -EREMOTEIO;
} }
deb_i2c("i2c rd %02x: ",reg); deb_i2c("i2c rd %02x: ",reg);
......
drivers/media/dvb/frontends/bcm3510.h
View file @ 271ddbf7
...@@ -41,7 +41,7 @@ extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config, ...@@ -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, static inline struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_BCM3510 #endif // CONFIG_DVB_BCM3510
......
drivers/media/dvb/frontends/cx22700.c
View file @ 271ddbf7
...@@ -73,13 +73,13 @@ static int cx22700_writereg (struct cx22700_state* state, u8 reg, u8 data) ...@@ -73,13 +73,13 @@ static int cx22700_writereg (struct cx22700_state* state, u8 reg, u8 data)
u8 buf [] = { reg, data }; u8 buf [] = { reg, data };
struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; 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); ret = i2c_transfer (state->i2c, &msg, 1);
if (ret != 1) if (ret != 1)
printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", 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; return (ret != 1) ? -1 : 0;
} }
...@@ -92,7 +92,7 @@ static int cx22700_readreg (struct cx22700_state* state, u8 reg) ...@@ -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 }, 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 } }; { .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); ret = i2c_transfer (state->i2c, msg, 2);
...@@ -105,7 +105,7 @@ static int cx22700_set_inversion (struct cx22700_state* state, int inversion) ...@@ -105,7 +105,7 @@ static int cx22700_set_inversion (struct cx22700_state* state, int inversion)
{ {
u8 val; u8 val;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
switch (inversion) { switch (inversion) {
case INVERSION_AUTO: case INVERSION_AUTO:
...@@ -127,7 +127,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet ...@@ -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 }; static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 };
u8 val; 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) if (p->code_rate_HP < FEC_1_2 || p->code_rate_HP > FEC_7_8)
return -EINVAL; return -EINVAL;
...@@ -191,7 +191,7 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet ...@@ -191,7 +191,7 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet
FEC_5_6, FEC_7_8 }; FEC_5_6, FEC_7_8 };
u8 val; u8 val;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (!(cx22700_readreg(state, 0x07) & 0x20)) /* tps valid? */ if (!(cx22700_readreg(state, 0x07) & 0x20)) /* tps valid? */
return -EAGAIN; return -EAGAIN;
......
drivers/media/dvb/frontends/cx22700.h
View file @ 271ddbf7
...@@ -38,7 +38,7 @@ extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config, ...@@ -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, static inline struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_CX22700 #endif // CONFIG_DVB_CX22700
......
drivers/media/dvb/frontends/cx22702.c
View file @ 271ddbf7
...@@ -90,7 +90,7 @@ static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data) ...@@ -90,7 +90,7 @@ static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", 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; return (ret != 1) ? -1 : 0;
} }
...@@ -108,7 +108,7 @@ static u8 cx22702_readreg (struct cx22702_state* state, u8 reg) ...@@ -108,7 +108,7 @@ static u8 cx22702_readreg (struct cx22702_state* state, u8 reg)
ret = i2c_transfer(state->i2c, msg, 2); ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 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]; return b1[0];
} }
...@@ -195,7 +195,7 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet ...@@ -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) static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
{ {
struct cx22702_state* state = fe->demodulator_priv; struct cx22702_state* state = fe->demodulator_priv;
dprintk ("%s(%d)\n", __FUNCTION__, enable); dprintk ("%s(%d)\n", __func__, enable);
if (enable) if (enable)
return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe); return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe);
else else
...@@ -228,7 +228,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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 ); cx22702_writereg(state, 0x0C, cx22702_readreg(state, 0x0C) &0xcf );
break; break;
default: default:
dprintk ("%s: invalid bandwidth\n",__FUNCTION__); dprintk ("%s: invalid bandwidth\n",__func__);
return -EINVAL; return -EINVAL;
} }
...@@ -250,7 +250,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc );
cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 ); cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );
cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */ cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */
dprintk("%s: Autodetecting\n",__FUNCTION__); dprintk("%s: Autodetecting\n",__func__);
return 0; return 0;
} }
...@@ -261,7 +261,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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_16: val = (val&0xe7)|0x08; break;
case QAM_64: val = (val&0xe7)|0x10; break; case QAM_64: val = (val&0xe7)|0x10; break;
default: default:
dprintk ("%s: invalid constellation\n",__FUNCTION__); dprintk ("%s: invalid constellation\n",__func__);
return -EINVAL; return -EINVAL;
} }
switch(p->u.ofdm.hierarchy_information) { switch(p->u.ofdm.hierarchy_information) {
...@@ -270,7 +270,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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_2: val = (val&0xf8)|2; break;
case HIERARCHY_4: val = (val&0xf8)|3; break; case HIERARCHY_4: val = (val&0xf8)|3; break;
default: default:
dprintk ("%s: invalid hierarchy\n",__FUNCTION__); dprintk ("%s: invalid hierarchy\n",__func__);
return -EINVAL; return -EINVAL;
} }
cx22702_writereg (state, 0x06, val); cx22702_writereg (state, 0x06, val);
...@@ -284,7 +284,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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_5_6: val = (val&0xc7)|0x18; break;
case FEC_7_8: val = (val&0xc7)|0x20; break; case FEC_7_8: val = (val&0xc7)|0x20; break;
default: default:
dprintk ("%s: invalid code_rate_HP\n",__FUNCTION__); dprintk ("%s: invalid code_rate_HP\n",__func__);
return -EINVAL; return -EINVAL;
} }
switch(p->u.ofdm.code_rate_LP) { switch(p->u.ofdm.code_rate_LP) {
...@@ -295,7 +295,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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_5_6: val = (val&0xf8)|3; break;
case FEC_7_8: val = (val&0xf8)|4; break; case FEC_7_8: val = (val&0xf8)|4; break;
default: default:
dprintk ("%s: invalid code_rate_LP\n",__FUNCTION__); dprintk ("%s: invalid code_rate_LP\n",__func__);
return -EINVAL; return -EINVAL;
} }
cx22702_writereg (state, 0x07, val); cx22702_writereg (state, 0x07, val);
...@@ -307,14 +307,14 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -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_8: val = (val&0xf3)|0x08; break;
case GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break; case GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break;
default: default:
dprintk ("%s: invalid guard_interval\n",__FUNCTION__); dprintk ("%s: invalid guard_interval\n",__func__);
return -EINVAL; return -EINVAL;
} }
switch(p->u.ofdm.transmission_mode) { switch(p->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: val = (val&0xfc); break; case TRANSMISSION_MODE_2K: val = (val&0xfc); break;
case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break; case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break;
default: default:
dprintk ("%s: invalid transmission_mode\n",__FUNCTION__); dprintk ("%s: invalid transmission_mode\n",__func__);
return -EINVAL; return -EINVAL;
} }
cx22702_writereg(state, 0x08, val); cx22702_writereg(state, 0x08, val);
...@@ -360,7 +360,7 @@ static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -360,7 +360,7 @@ static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)
reg23 = cx22702_readreg (state, 0x23); reg23 = cx22702_readreg (state, 0x23);
dprintk ("%s: status demod=0x%02x agc=0x%02x\n" dprintk ("%s: status demod=0x%02x agc=0x%02x\n"
,__FUNCTION__,reg0A,reg23); ,__func__,reg0A,reg23);
if(reg0A & 0x10) { if(reg0A & 0x10) {
*status |= FE_HAS_LOCK; *status |= FE_HAS_LOCK;
......
drivers/media/dvb/frontends/cx22702.h
View file @ 271ddbf7
...@@ -48,7 +48,7 @@ extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, ...@@ -48,7 +48,7 @@ extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
static inline struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, static inline struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_CX22702 #endif // CONFIG_DVB_CX22702
......
drivers/media/dvb/frontends/cx24110.c
View file @ 271ddbf7
...@@ -121,7 +121,7 @@ static int cx24110_writereg (struct cx24110_state* state, int reg, int data) ...@@ -121,7 +121,7 @@ static int cx24110_writereg (struct cx24110_state* state, int reg, int data)
if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
dprintk ("%s: writereg error (err == %i, reg == 0x%02x," dprintk ("%s: writereg error (err == %i, reg == 0x%02x,"
" data == 0x%02x)\n", __FUNCTION__, err, reg, data); " data == 0x%02x)\n", __func__, err, reg, data);
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -247,7 +247,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate) ...@@ -247,7 +247,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
static const u32 bands[]={5000000UL,15000000UL,90999000UL/2}; static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
int i; int i;
dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate); dprintk("cx24110 debug: entering %s(%d)\n",__func__,srate);
if (srate>90999000UL/2) if (srate>90999000UL/2)
srate=90999000UL/2; srate=90999000UL/2;
if (srate<500000) if (srate<500000)
...@@ -358,7 +358,7 @@ static int cx24110_initfe(struct dvb_frontend* fe) ...@@ -358,7 +358,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
/* fixme (low): error handling */ /* fixme (low): error handling */
int i; int i;
dprintk("%s: init chip\n", __FUNCTION__); dprintk("%s: init chip\n", __func__);
for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) { for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {
cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data); cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
......
drivers/media/dvb/frontends/cx24110.h
View file @ 271ddbf7
...@@ -48,7 +48,7 @@ extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, ...@@ -48,7 +48,7 @@ extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
static inline struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, static inline struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_CX24110 #endif // CONFIG_DVB_CX24110
......
drivers/media/dvb/frontends/dib3000.h
View file @ 271ddbf7
...@@ -48,7 +48,7 @@ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config ...@@ -48,7 +48,7 @@ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config
static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config, static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops) struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
{ {
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 // CONFIG_DVB_DIB3000MB #endif // CONFIG_DVB_DIB3000MB
......
drivers/media/dvb/frontends/dib3000mc.h
View file @ 271ddbf7
...@@ -44,7 +44,7 @@ extern struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i ...@@ -44,7 +44,7 @@ extern struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i
#else #else
static inline struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib3000mc_config *cfg) static inline struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib3000mc_config *cfg)
{ {
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 // CONFIG_DVB_DIB3000MC #endif // CONFIG_DVB_DIB3000MC
......
drivers/media/dvb/frontends/dvb-pll.h
View file @ 271ddbf7
...@@ -43,7 +43,7 @@ static inline struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, ...@@ -43,7 +43,7 @@ static inline struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct i2c_adapter *i2c,
unsigned int pll_desc_id) unsigned int pll_desc_id)
{ {
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
......
drivers/media/dvb/frontends/isl6405.h
View file @ 271ddbf7
...@@ -66,7 +66,7 @@ static inline struct dvb_frontend *isl6405_attach(struct dvb_frontend *fe, ...@@ -66,7 +66,7 @@ static inline struct dvb_frontend *isl6405_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 i2c_addr, struct i2c_adapter *i2c, u8 i2c_addr,
u8 override_set, u8 override_clear) u8 override_set, u8 override_clear)
{ {
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 /* CONFIG_DVB_ISL6405 */ #endif /* CONFIG_DVB_ISL6405 */
......
drivers/media/dvb/frontends/isl6421.h
View file @ 271ddbf7
...@@ -47,7 +47,7 @@ extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_a ...@@ -47,7 +47,7 @@ extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_a
static inline struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr, static inline struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,
u8 override_set, u8 override_clear) u8 override_set, u8 override_clear)
{ {
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 // CONFIG_DVB_ISL6421 #endif // CONFIG_DVB_ISL6421
......
drivers/media/dvb/frontends/l64781.c
View file @ 271ddbf7
...@@ -57,7 +57,7 @@ static int l64781_writereg (struct l64781_state* state, u8 reg, u8 data) ...@@ -57,7 +57,7 @@ static int l64781_writereg (struct l64781_state* state, u8 reg, u8 data)
if ((ret = i2c_transfer(state->i2c, &msg, 1)) != 1) if ((ret = i2c_transfer(state->i2c, &msg, 1)) != 1)
dprintk ("%s: write_reg error (reg == %02x) = %02x!\n", dprintk ("%s: write_reg error (reg == %02x) = %02x!\n",
__FUNCTION__, reg, ret); __func__, reg, ret);
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
} }
......
drivers/media/dvb/frontends/l64781.h
View file @ 271ddbf7
...@@ -38,7 +38,7 @@ extern struct dvb_frontend* l64781_attach(const struct l64781_config* config, ...@@ -38,7 +38,7 @@ extern struct dvb_frontend* l64781_attach(const struct l64781_config* config,
static inline struct dvb_frontend* l64781_attach(const struct l64781_config* config, static inline struct dvb_frontend* l64781_attach(const struct l64781_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_L64781 #endif // CONFIG_DVB_L64781
......
drivers/media/dvb/frontends/lgdt330x.c
View file @ 271ddbf7
...@@ -88,7 +88,7 @@ static int i2c_write_demod_bytes (struct lgdt330x_state* state, ...@@ -88,7 +88,7 @@ static int i2c_write_demod_bytes (struct lgdt330x_state* state,
for (i=0; i<len-1; i+=2){ for (i=0; i<len-1; i+=2){
if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
printk(KERN_WARNING "lgdt330x: %s error (addr %02x <- %02x, err = %i)\n", __FUNCTION__, msg.buf[0], msg.buf[1], err); printk(KERN_WARNING "lgdt330x: %s error (addr %02x <- %02x, err = %i)\n", __func__, msg.buf[0], msg.buf[1], err);
if (err < 0) if (err < 0)
return err; return err;
else else
...@@ -117,7 +117,7 @@ static u8 i2c_read_demod_bytes (struct lgdt330x_state* state, ...@@ -117,7 +117,7 @@ static u8 i2c_read_demod_bytes (struct lgdt330x_state* state,
int ret; int ret;
ret = i2c_transfer(state->i2c, msg, 2); ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __FUNCTION__, state->config->demod_address, reg, ret); printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __func__, state->config->demod_address, reg, ret);
} else { } else {
ret = 0; ret = 0;
} }
...@@ -256,7 +256,7 @@ static int lgdt330x_init(struct dvb_frontend* fe) ...@@ -256,7 +256,7 @@ static int lgdt330x_init(struct dvb_frontend* fe)
printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n"); printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n");
err = -ENODEV; err = -ENODEV;
} }
dprintk("%s entered as %s\n", __FUNCTION__, chip_name); dprintk("%s entered as %s\n", __func__, chip_name);
if (err < 0) if (err < 0)
return err; return err;
return lgdt330x_SwReset(state); return lgdt330x_SwReset(state);
...@@ -334,7 +334,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, ...@@ -334,7 +334,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
if (state->current_modulation != param->u.vsb.modulation) { if (state->current_modulation != param->u.vsb.modulation) {
switch(param->u.vsb.modulation) { switch(param->u.vsb.modulation) {
case VSB_8: case VSB_8:
dprintk("%s: VSB_8 MODE\n", __FUNCTION__); dprintk("%s: VSB_8 MODE\n", __func__);
/* Select VSB mode */ /* Select VSB mode */
top_ctrl_cfg[1] = 0x03; top_ctrl_cfg[1] = 0x03;
...@@ -350,7 +350,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, ...@@ -350,7 +350,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
break; break;
case QAM_64: case QAM_64:
dprintk("%s: QAM_64 MODE\n", __FUNCTION__); dprintk("%s: QAM_64 MODE\n", __func__);
/* Select QAM_64 mode */ /* Select QAM_64 mode */
top_ctrl_cfg[1] = 0x00; top_ctrl_cfg[1] = 0x00;
...@@ -366,7 +366,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, ...@@ -366,7 +366,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
break; break;
case QAM_256: case QAM_256:
dprintk("%s: QAM_256 MODE\n", __FUNCTION__); dprintk("%s: QAM_256 MODE\n", __func__);
/* Select QAM_256 mode */ /* Select QAM_256 mode */
top_ctrl_cfg[1] = 0x01; top_ctrl_cfg[1] = 0x01;
...@@ -381,7 +381,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, ...@@ -381,7 +381,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
} }
break; break;
default: default:
printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __FUNCTION__, param->u.vsb.modulation); printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __func__, param->u.vsb.modulation);
return -1; return -1;
} }
/* /*
...@@ -431,7 +431,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -431,7 +431,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
/* AGC status register */ /* AGC status register */
i2c_read_demod_bytes(state, AGC_STATUS, buf, 1); i2c_read_demod_bytes(state, AGC_STATUS, buf, 1);
dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]); dprintk("%s: AGC_STATUS = 0x%02x\n", __func__, buf[0]);
if ((buf[0] & 0x0c) == 0x8){ if ((buf[0] & 0x0c) == 0x8){
/* Test signal does not exist flag */ /* Test signal does not exist flag */
/* as well as the AGC lock flag. */ /* as well as the AGC lock flag. */
...@@ -445,7 +445,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -445,7 +445,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
*/ */
/* signal status */ /* signal status */
i2c_read_demod_bytes(state, TOP_CONTROL, buf, sizeof(buf)); i2c_read_demod_bytes(state, TOP_CONTROL, buf, sizeof(buf));
dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __FUNCTION__, buf[0], buf[1], buf[2]); dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __func__, buf[0], buf[1], buf[2]);
/* sync status */ /* sync status */
...@@ -461,7 +461,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -461,7 +461,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
/* Carrier Recovery Lock Status Register */ /* Carrier Recovery Lock Status Register */
i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]); dprintk("%s: CARRIER_LOCK = 0x%02x\n", __func__, buf[0]);
switch (state->current_modulation) { switch (state->current_modulation) {
case QAM_256: case QAM_256:
case QAM_64: case QAM_64:
...@@ -474,7 +474,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -474,7 +474,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
*status |= FE_HAS_CARRIER; *status |= FE_HAS_CARRIER;
break; break;
default: default:
printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __FUNCTION__); printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __func__);
} }
return 0; return 0;
...@@ -493,7 +493,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -493,7 +493,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
if (err < 0) if (err < 0)
return err; return err;
dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]); dprintk("%s: AGC_STATUS = 0x%02x\n", __func__, buf[0]);
if ((buf[0] & 0x21) == 0x01){ if ((buf[0] & 0x21) == 0x01){
/* Test input signal does not exist flag */ /* Test input signal does not exist flag */
/* as well as the AGC lock flag. */ /* as well as the AGC lock flag. */
...@@ -502,7 +502,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -502,7 +502,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
/* Carrier Recovery Lock Status Register */ /* Carrier Recovery Lock Status Register */
i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]); dprintk("%s: CARRIER_LOCK = 0x%02x\n", __func__, buf[0]);
switch (state->current_modulation) { switch (state->current_modulation) {
case QAM_256: case QAM_256:
case QAM_64: case QAM_64:
...@@ -533,7 +533,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -533,7 +533,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
} }
break; break;
default: default:
printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __FUNCTION__); printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __func__);
} }
return 0; return 0;
} }
...@@ -607,14 +607,14 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -607,14 +607,14 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
break; break;
default: default:
printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n", printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n",
__FUNCTION__); __func__);
return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */ return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */
} }
state->snr = calculate_snr(noise, c); state->snr = calculate_snr(noise, c);
*snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */ *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */
dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
return 0; return 0;
...@@ -651,14 +651,14 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -651,14 +651,14 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr)
break; break;
default: default:
printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n", printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n",
__FUNCTION__); __func__);
return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */ return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */
} }
state->snr = calculate_snr(noise, c); state->snr = calculate_snr(noise, c);
*snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */ *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */
dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
state->snr >> 24, (((state->snr >> 8) & 0xffff) * 100) >> 16); state->snr >> 24, (((state->snr >> 8) & 0xffff) * 100) >> 16);
return 0; return 0;
...@@ -743,7 +743,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config, ...@@ -743,7 +743,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
error: error:
kfree(state); kfree(state);
dprintk("%s: ERROR\n",__FUNCTION__); dprintk("%s: ERROR\n",__func__);
return NULL; return NULL;
} }
......
drivers/media/dvb/frontends/lgdt330x.h
View file @ 271ddbf7
...@@ -59,7 +59,7 @@ extern struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config ...@@ -59,7 +59,7 @@ extern struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config
static inline struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config, static inline struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_LGDT330X #endif // CONFIG_DVB_LGDT330X
......
drivers/media/dvb/frontends/lnbp21.h
View file @ 271ddbf7
...@@ -45,7 +45,7 @@ extern struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_ad ...@@ -45,7 +45,7 @@ extern struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_ad
#else #else
static inline struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear) static inline struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)
{ {
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 // CONFIG_DVB_LNBP21 #endif // CONFIG_DVB_LNBP21
......
drivers/media/dvb/frontends/mt2060.h
View file @ 271ddbf7
...@@ -35,7 +35,7 @@ extern struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_a ...@@ -35,7 +35,7 @@ extern struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_a
#else #else
static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1) static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1)
{ {
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 // CONFIG_DVB_TUNER_MT2060 #endif // CONFIG_DVB_TUNER_MT2060
......
drivers/media/dvb/frontends/mt2131.c
View file @ 271ddbf7
...@@ -110,7 +110,7 @@ static int mt2131_set_params(struct dvb_frontend *fe, ...@@ -110,7 +110,7 @@ static int mt2131_set_params(struct dvb_frontend *fe,
priv->bandwidth = 0; priv->bandwidth = 0;
freq = params->frequency / 1000; // Hz -> kHz freq = params->frequency / 1000; // Hz -> kHz
dprintk(1, "%s() freq=%d\n", __FUNCTION__, freq); dprintk(1, "%s() freq=%d\n", __func__, freq);
f_lo1 = freq + MT2131_IF1 * 1000; f_lo1 = freq + MT2131_IF1 * 1000;
f_lo1 = (f_lo1 / 250) * 250; f_lo1 = (f_lo1 / 250) * 250;
...@@ -187,7 +187,7 @@ static int mt2131_set_params(struct dvb_frontend *fe, ...@@ -187,7 +187,7 @@ static int mt2131_set_params(struct dvb_frontend *fe,
static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency) static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{ {
struct mt2131_priv *priv = fe->tuner_priv; struct mt2131_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
*frequency = priv->frequency; *frequency = priv->frequency;
return 0; return 0;
} }
...@@ -195,7 +195,7 @@ static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency) ...@@ -195,7 +195,7 @@ static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency)
static int mt2131_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth) static int mt2131_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
{ {
struct mt2131_priv *priv = fe->tuner_priv; struct mt2131_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
*bandwidth = priv->bandwidth; *bandwidth = priv->bandwidth;
return 0; return 0;
} }
...@@ -214,7 +214,7 @@ static int mt2131_get_status(struct dvb_frontend *fe, u32 *status) ...@@ -214,7 +214,7 @@ static int mt2131_get_status(struct dvb_frontend *fe, u32 *status)
mt2131_readreg(priv, 0x09, &afc_status); mt2131_readreg(priv, 0x09, &afc_status);
dprintk(1, "%s() - LO Status = 0x%x, AFC Status = 0x%x\n", dprintk(1, "%s() - LO Status = 0x%x, AFC Status = 0x%x\n",
__FUNCTION__, lock_status, afc_status); __func__, lock_status, afc_status);
return 0; return 0;
} }
...@@ -223,7 +223,7 @@ static int mt2131_init(struct dvb_frontend *fe) ...@@ -223,7 +223,7 @@ static int mt2131_init(struct dvb_frontend *fe)
{ {
struct mt2131_priv *priv = fe->tuner_priv; struct mt2131_priv *priv = fe->tuner_priv;
int ret; int ret;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
if ((ret = mt2131_writeregs(priv, mt2131_config1, if ((ret = mt2131_writeregs(priv, mt2131_config1,
sizeof(mt2131_config1))) < 0) sizeof(mt2131_config1))) < 0)
...@@ -243,7 +243,7 @@ static int mt2131_init(struct dvb_frontend *fe) ...@@ -243,7 +243,7 @@ static int mt2131_init(struct dvb_frontend *fe)
static int mt2131_release(struct dvb_frontend *fe) static int mt2131_release(struct dvb_frontend *fe)
{ {
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
kfree(fe->tuner_priv); kfree(fe->tuner_priv);
fe->tuner_priv = NULL; fe->tuner_priv = NULL;
return 0; return 0;
...@@ -273,7 +273,7 @@ struct dvb_frontend * mt2131_attach(struct dvb_frontend *fe, ...@@ -273,7 +273,7 @@ struct dvb_frontend * mt2131_attach(struct dvb_frontend *fe,
struct mt2131_priv *priv = NULL; struct mt2131_priv *priv = NULL;
u8 id = 0; u8 id = 0;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
priv = kzalloc(sizeof(struct mt2131_priv), GFP_KERNEL); priv = kzalloc(sizeof(struct mt2131_priv), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
......
drivers/media/dvb/frontends/mt2131.h
View file @ 271ddbf7
...@@ -41,7 +41,7 @@ static inline struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe, ...@@ -41,7 +41,7 @@ static inline struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe,
struct mt2131_config *cfg, struct mt2131_config *cfg,
u16 if1) u16 if1)
{ {
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 /* CONFIG_DVB_TUNER_MT2131 */ #endif /* CONFIG_DVB_TUNER_MT2131 */
......
drivers/media/dvb/frontends/mt2266.h
View file @ 271ddbf7
...@@ -29,7 +29,7 @@ extern struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_a ...@@ -29,7 +29,7 @@ extern struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_a
#else #else
static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg) static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg)
{ {
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 // CONFIG_DVB_TUNER_MT2266 #endif // CONFIG_DVB_TUNER_MT2266
......
drivers/media/dvb/frontends/mt312.c
View file @ 271ddbf7
...@@ -76,7 +76,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, ...@@ -76,7 +76,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg,
ret = i2c_transfer(state->i2c, msg, 2); ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
printk(KERN_ERR "%s: ret == %d\n", __FUNCTION__, ret); printk(KERN_ERR "%s: ret == %d\n", __func__, ret);
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -117,7 +117,7 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg, ...@@ -117,7 +117,7 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg,
ret = i2c_transfer(state->i2c, &msg, 1); ret = i2c_transfer(state->i2c, &msg, 1);
if (ret != 1) { if (ret != 1) {
dprintk("%s: ret == %d\n", __FUNCTION__, ret); dprintk("%s: ret == %d\n", __func__, ret);
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -499,7 +499,7 @@ static int mt312_set_frontend(struct dvb_frontend *fe, ...@@ -499,7 +499,7 @@ static int mt312_set_frontend(struct dvb_frontend *fe,
{ 0x00, 0x01, 0x02, 0x04, 0x3f, 0x08, 0x10, 0x20, 0x3f, 0x3f }; { 0x00, 0x01, 0x02, 0x04, 0x3f, 0x08, 0x10, 0x20, 0x3f, 0x3f };
const u8 inv_tab[3] = { 0x00, 0x40, 0x80 }; const u8 inv_tab[3] = { 0x00, 0x40, 0x80 };
dprintk("%s: Freq %d\n", __FUNCTION__, p->frequency); dprintk("%s: Freq %d\n", __func__, p->frequency);
if ((p->frequency < fe->ops.info.frequency_min) if ((p->frequency < fe->ops.info.frequency_min)
|| (p->frequency > fe->ops.info.frequency_max)) || (p->frequency > fe->ops.info.frequency_max))
......
drivers/media/dvb/frontends/mt312.h
View file @ 271ddbf7
...@@ -40,7 +40,7 @@ struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config, ...@@ -40,7 +40,7 @@ struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
static inline struct dvb_frontend *vp310_mt312_attach( static inline struct dvb_frontend *vp310_mt312_attach(
const struct mt312_config *config, struct i2c_adapter *i2c) const struct mt312_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; return NULL;
} }
#endif /* CONFIG_DVB_MT312 */ #endif /* CONFIG_DVB_MT312 */
......
drivers/media/dvb/frontends/mt352.c
View file @ 271ddbf7
...@@ -95,7 +95,7 @@ static int mt352_read_register(struct mt352_state* state, u8 reg) ...@@ -95,7 +95,7 @@ static int mt352_read_register(struct mt352_state* state, u8 reg)
if (ret != 2) { if (ret != 2) {
printk("%s: readreg error (reg=%d, ret==%i)\n", printk("%s: readreg error (reg=%d, ret==%i)\n",
__FUNCTION__, reg, ret); __func__, reg, ret);
return ret; return ret;
} }
...@@ -135,7 +135,7 @@ static void mt352_calc_nominal_rate(struct mt352_state* state, ...@@ -135,7 +135,7 @@ static void mt352_calc_nominal_rate(struct mt352_state* state,
value = 64 * bw * (1<<16) / (7 * 8); value = 64 * bw * (1<<16) / (7 * 8);
value = value * 1000 / adc_clock; value = value * 1000 / adc_clock;
dprintk("%s: bw %d, adc_clock %d => 0x%x\n", dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
__FUNCTION__, bw, adc_clock, value); __func__, bw, adc_clock, value);
buf[0] = msb(value); buf[0] = msb(value);
buf[1] = lsb(value); buf[1] = lsb(value);
} }
...@@ -161,7 +161,7 @@ static void mt352_calc_input_freq(struct mt352_state* state, ...@@ -161,7 +161,7 @@ static void mt352_calc_input_freq(struct mt352_state* state,
} }
value = -16374 * ife / adc_clock; value = -16374 * ife / adc_clock;
dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n", dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n",
__FUNCTION__, if2, ife, adc_clock, value, value & 0x3fff); __func__, if2, ife, adc_clock, value, value & 0x3fff);
buf[0] = msb(value); buf[0] = msb(value);
buf[1] = lsb(value); buf[1] = lsb(value);
} }
...@@ -521,7 +521,7 @@ static int mt352_init(struct dvb_frontend* fe) ...@@ -521,7 +521,7 @@ static int mt352_init(struct dvb_frontend* fe)
static u8 mt352_reset_attach [] = { RESET, 0xC0 }; static u8 mt352_reset_attach [] = { RESET, 0xC0 };
dprintk("%s: hello\n",__FUNCTION__); dprintk("%s: hello\n",__func__);
if ((mt352_read_register(state, CLOCK_CTL) & 0x10) == 0 || if ((mt352_read_register(state, CLOCK_CTL) & 0x10) == 0 ||
(mt352_read_register(state, CONFIG) & 0x20) == 0) { (mt352_read_register(state, CONFIG) & 0x20) == 0) {
......
drivers/media/dvb/frontends/mt352.h
View file @ 271ddbf7
...@@ -58,7 +58,7 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config, ...@@ -58,7 +58,7 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,
static inline struct dvb_frontend* mt352_attach(const struct mt352_config* config, static inline struct dvb_frontend* mt352_attach(const struct mt352_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_MT352 #endif // CONFIG_DVB_MT352
......
drivers/media/dvb/frontends/nxt200x.c
View file @ 271ddbf7
...@@ -74,7 +74,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len ...@@ -74,7 +74,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n", printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
__FUNCTION__, addr, err); __func__, addr, err);
return -EREMOTEIO; return -EREMOTEIO;
} }
return 0; return 0;
...@@ -87,7 +87,7 @@ static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len) ...@@ -87,7 +87,7 @@ static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n", printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
__FUNCTION__, addr, err); __func__, addr, err);
return -EREMOTEIO; return -EREMOTEIO;
} }
return 0; return 0;
...@@ -104,7 +104,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg, u8 *buf, u8 ...@@ -104,7 +104,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg, u8 *buf, u8
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n", printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
__FUNCTION__, state->config->demod_address, err); __func__, state->config->demod_address, err);
return -EREMOTEIO; return -EREMOTEIO;
} }
return 0; return 0;
...@@ -121,7 +121,7 @@ static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 le ...@@ -121,7 +121,7 @@ static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 le
if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) { if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n", printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
__FUNCTION__, state->config->demod_address, err); __func__, state->config->demod_address, err);
return -EREMOTEIO; return -EREMOTEIO;
} }
return 0; return 0;
...@@ -146,7 +146,7 @@ static u16 nxt200x_crc(u16 crc, u8 c) ...@@ -146,7 +146,7 @@ static u16 nxt200x_crc(u16 crc, u8 c)
static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len) static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len)
{ {
u8 attr, len2, buf; u8 attr, len2, buf;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
/* set mutli register register */ /* set mutli register register */
nxt200x_writebytes(state, 0x35, &reg, 1); nxt200x_writebytes(state, 0x35, &reg, 1);
...@@ -207,7 +207,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d ...@@ -207,7 +207,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
{ {
int i; int i;
u8 buf, len2, attr; u8 buf, len2, attr;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
/* set mutli register register */ /* set mutli register register */
nxt200x_writebytes(state, 0x35, &reg, 1); nxt200x_writebytes(state, 0x35, &reg, 1);
...@@ -254,7 +254,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d ...@@ -254,7 +254,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
static void nxt200x_microcontroller_stop (struct nxt200x_state* state) static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
{ {
u8 buf, stopval, counter = 0; u8 buf, stopval, counter = 0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
/* set correct stop value */ /* set correct stop value */
switch (state->demod_chip) { switch (state->demod_chip) {
...@@ -287,7 +287,7 @@ static void nxt200x_microcontroller_stop (struct nxt200x_state* state) ...@@ -287,7 +287,7 @@ static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
static void nxt200x_microcontroller_start (struct nxt200x_state* state) static void nxt200x_microcontroller_start (struct nxt200x_state* state)
{ {
u8 buf; u8 buf;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
buf = 0x00; buf = 0x00;
nxt200x_writebytes(state, 0x22, &buf, 1); nxt200x_writebytes(state, 0x22, &buf, 1);
...@@ -297,7 +297,7 @@ static void nxt2004_microcontroller_init (struct nxt200x_state* state) ...@@ -297,7 +297,7 @@ static void nxt2004_microcontroller_init (struct nxt200x_state* state)
{ {
u8 buf[9]; u8 buf[9];
u8 counter = 0; u8 counter = 0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
buf[0] = 0x00; buf[0] = 0x00;
nxt200x_writebytes(state, 0x2b, buf, 1); nxt200x_writebytes(state, 0x2b, buf, 1);
...@@ -328,7 +328,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data) ...@@ -328,7 +328,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
{ {
u8 buf, count = 0; u8 buf, count = 0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]); dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]);
...@@ -387,7 +387,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data) ...@@ -387,7 +387,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
static void nxt200x_agc_reset(struct nxt200x_state* state) static void nxt200x_agc_reset(struct nxt200x_state* state)
{ {
u8 buf; u8 buf;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
switch (state->demod_chip) { switch (state->demod_chip) {
case NXT2002: case NXT2002:
...@@ -416,7 +416,7 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware ...@@ -416,7 +416,7 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
u8 buf[3], written = 0, chunkpos = 0; u8 buf[3], written = 0, chunkpos = 0;
u16 rambase, position, crc = 0; u16 rambase, position, crc = 0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
dprintk("Firmware is %zu bytes\n", fw->size); dprintk("Firmware is %zu bytes\n", fw->size);
/* Get the RAM base for this nxt2002 */ /* Get the RAM base for this nxt2002 */
...@@ -483,7 +483,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware ...@@ -483,7 +483,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
u8 buf[3]; u8 buf[3];
u16 rambase, position, crc=0; u16 rambase, position, crc=0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
dprintk("Firmware is %zu bytes\n", fw->size); dprintk("Firmware is %zu bytes\n", fw->size);
/* set rambase */ /* set rambase */
......
drivers/media/dvb/frontends/nxt200x.h
View file @ 271ddbf7
...@@ -49,7 +49,7 @@ extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, ...@@ -49,7 +49,7 @@ extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
static inline struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, static inline struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_NXT200X #endif // CONFIG_DVB_NXT200X
......
drivers/media/dvb/frontends/nxt6000.h
View file @ 271ddbf7
...@@ -40,7 +40,7 @@ extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config, ...@@ -40,7 +40,7 @@ extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
static inline struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config, static inline struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_NXT6000 #endif // CONFIG_DVB_NXT6000
......
drivers/media/dvb/frontends/or51132.c
View file @ 271ddbf7
...@@ -419,7 +419,7 @@ static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -419,7 +419,7 @@ static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status)
*status = 0; *status = 0;
return -EREMOTEIO; return -EREMOTEIO;
} }
dprintk("%s: read_status %04x\n", __FUNCTION__, reg); dprintk("%s: read_status %04x\n", __func__, reg);
if (reg & 0x0100) /* Receiver Lock */ if (reg & 0x0100) /* Receiver Lock */
*status = FE_HAS_SIGNAL|FE_HAS_CARRIER|FE_HAS_VITERBI| *status = FE_HAS_SIGNAL|FE_HAS_CARRIER|FE_HAS_VITERBI|
...@@ -504,14 +504,14 @@ static int or51132_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -504,14 +504,14 @@ static int or51132_read_snr(struct dvb_frontend* fe, u16* snr)
if (retry--) goto start; if (retry--) goto start;
return -EREMOTEIO; return -EREMOTEIO;
} }
dprintk("%s: modulation %02x, NTSC rej O%s\n", __FUNCTION__, dprintk("%s: modulation %02x, NTSC rej O%s\n", __func__,
reg&0xff, reg&0x1000?"n":"ff"); reg&0xff, reg&0x1000?"n":"ff");
/* Calculate SNR using noise, c, and NTSC rejection correction */ /* Calculate SNR using noise, c, and NTSC rejection correction */
state->snr = calculate_snr(noise, c) - usK; state->snr = calculate_snr(noise, c) - usK;
*snr = (state->snr) >> 16; *snr = (state->snr) >> 16;
dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
return 0; return 0;
......
drivers/media/dvb/frontends/or51132.h
View file @ 271ddbf7
...@@ -41,7 +41,7 @@ extern struct dvb_frontend* or51132_attach(const struct or51132_config* config, ...@@ -41,7 +41,7 @@ extern struct dvb_frontend* or51132_attach(const struct or51132_config* config,
static inline struct dvb_frontend* or51132_attach(const struct or51132_config* config, static inline struct dvb_frontend* or51132_attach(const struct or51132_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_OR51132 #endif // CONFIG_DVB_OR51132
......
drivers/media/dvb/frontends/or51211.c
View file @ 271ddbf7
...@@ -307,19 +307,19 @@ static int or51211_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -307,19 +307,19 @@ static int or51211_read_snr(struct dvb_frontend* fe, u16* snr)
if (i2c_writebytes(state,state->config->demod_address,snd_buf,3)) { if (i2c_writebytes(state,state->config->demod_address,snd_buf,3)) {
printk(KERN_WARNING "%s: error writing snr reg\n", printk(KERN_WARNING "%s: error writing snr reg\n",
__FUNCTION__); __func__);
return -1; return -1;
} }
if (i2c_readbytes(state,state->config->demod_address,rec_buf,2)) { if (i2c_readbytes(state,state->config->demod_address,rec_buf,2)) {
printk(KERN_WARNING "%s: read_status read error\n", printk(KERN_WARNING "%s: read_status read error\n",
__FUNCTION__); __func__);
return -1; return -1;
} }
state->snr = calculate_snr(rec_buf[0], 89599047); state->snr = calculate_snr(rec_buf[0], 89599047);
*snr = (state->snr) >> 16; *snr = (state->snr) >> 16;
dprintk("%s: noise = 0x%02x, snr = %d.%02d dB\n", __FUNCTION__, rec_buf[0], dprintk("%s: noise = 0x%02x, snr = %d.%02d dB\n", __func__, rec_buf[0],
state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
return 0; return 0;
......
drivers/media/dvb/frontends/or51211.h
View file @ 271ddbf7
...@@ -44,7 +44,7 @@ extern struct dvb_frontend* or51211_attach(const struct or51211_config* config, ...@@ -44,7 +44,7 @@ extern struct dvb_frontend* or51211_attach(const struct or51211_config* config,
static inline struct dvb_frontend* or51211_attach(const struct or51211_config* config, static inline struct dvb_frontend* or51211_attach(const struct or51211_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_OR51211 #endif // CONFIG_DVB_OR51211
......
drivers/media/dvb/frontends/qt1010.h
View file @ 271ddbf7
...@@ -45,7 +45,7 @@ static inline struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe, ...@@ -45,7 +45,7 @@ static inline struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct i2c_adapter *i2c,
struct qt1010_config *cfg) struct qt1010_config *cfg)
{ {
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 // CONFIG_DVB_TUNER_QT1010 #endif // CONFIG_DVB_TUNER_QT1010
......
drivers/media/dvb/frontends/s5h1409.c
View file @ 271ddbf7
...@@ -312,7 +312,7 @@ static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data) ...@@ -312,7 +312,7 @@ static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)
if (ret != 1) if (ret != 1)
printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, " printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, "
"ret == %i)\n", __FUNCTION__, reg, data, ret); "ret == %i)\n", __func__, reg, data, ret);
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
} }
...@@ -332,7 +332,7 @@ static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg) ...@@ -332,7 +332,7 @@ static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)
ret = i2c_transfer(state->i2c, msg, 2); ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 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] << 8) | b1[1]; return (b1[0] << 8) | b1[1];
} }
...@@ -340,7 +340,7 @@ static int s5h1409_softreset(struct dvb_frontend* fe) ...@@ -340,7 +340,7 @@ static int s5h1409_softreset(struct dvb_frontend* fe)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
s5h1409_writereg(state, 0xf5, 0); s5h1409_writereg(state, 0xf5, 0);
s5h1409_writereg(state, 0xf5, 1); s5h1409_writereg(state, 0xf5, 1);
...@@ -356,7 +356,7 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz) ...@@ -356,7 +356,7 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(%d KHz)\n", __FUNCTION__, KHz); dprintk("%s(%d KHz)\n", __func__, KHz);
switch (KHz) { switch (KHz) {
case 4000: case 4000:
...@@ -381,7 +381,7 @@ static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted) ...@@ -381,7 +381,7 @@ static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(%d)\n", __FUNCTION__, inverted); dprintk("%s(%d)\n", __func__, inverted);
if(inverted == 1) if(inverted == 1)
return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */ return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */
...@@ -394,25 +394,25 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe, ...@@ -394,25 +394,25 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(0x%08x)\n", __FUNCTION__, m); dprintk("%s(0x%08x)\n", __func__, m);
switch(m) { switch(m) {
case VSB_8: case VSB_8:
dprintk("%s() VSB_8\n", __FUNCTION__); dprintk("%s() VSB_8\n", __func__);
if (state->if_freq != S5H1409_VSB_IF_FREQ) if (state->if_freq != S5H1409_VSB_IF_FREQ)
s5h1409_set_if_freq(fe, S5H1409_VSB_IF_FREQ); s5h1409_set_if_freq(fe, S5H1409_VSB_IF_FREQ);
s5h1409_writereg(state, 0xf4, 0); s5h1409_writereg(state, 0xf4, 0);
break; break;
case QAM_64: case QAM_64:
case QAM_256: case QAM_256:
dprintk("%s() QAM_AUTO (64/256)\n", __FUNCTION__); dprintk("%s() QAM_AUTO (64/256)\n", __func__);
if (state->if_freq != S5H1409_QAM_IF_FREQ) if (state->if_freq != S5H1409_QAM_IF_FREQ)
s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ); s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ);
s5h1409_writereg(state, 0xf4, 1); s5h1409_writereg(state, 0xf4, 1);
s5h1409_writereg(state, 0x85, 0x110); s5h1409_writereg(state, 0x85, 0x110);
break; break;
default: default:
dprintk("%s() Invalid modulation\n", __FUNCTION__); dprintk("%s() Invalid modulation\n", __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -426,7 +426,7 @@ static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) ...@@ -426,7 +426,7 @@ static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(%d)\n", __FUNCTION__, enable); dprintk("%s(%d)\n", __func__, enable);
if (enable) if (enable)
return s5h1409_writereg(state, 0xf3, 1); return s5h1409_writereg(state, 0xf3, 1);
...@@ -438,7 +438,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable) ...@@ -438,7 +438,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(%d)\n", __FUNCTION__, enable); dprintk("%s(%d)\n", __func__, enable);
if (enable) if (enable)
return s5h1409_writereg(state, 0xe3, return s5h1409_writereg(state, 0xe3,
...@@ -452,7 +452,7 @@ static int s5h1409_sleep(struct dvb_frontend* fe, int enable) ...@@ -452,7 +452,7 @@ static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(%d)\n", __FUNCTION__, enable); dprintk("%s(%d)\n", __func__, enable);
return s5h1409_writereg(state, 0xf2, enable); return s5h1409_writereg(state, 0xf2, enable);
} }
...@@ -461,7 +461,7 @@ static int s5h1409_register_reset(struct dvb_frontend* fe) ...@@ -461,7 +461,7 @@ static int s5h1409_register_reset(struct dvb_frontend* fe)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
return s5h1409_writereg(state, 0xfa, 0); return s5h1409_writereg(state, 0xfa, 0);
} }
...@@ -534,7 +534,7 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe, ...@@ -534,7 +534,7 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe,
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s(frequency=%d)\n", __FUNCTION__, p->frequency); dprintk("%s(frequency=%d)\n", __func__, p->frequency);
s5h1409_softreset(fe); s5h1409_softreset(fe);
...@@ -565,7 +565,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode) ...@@ -565,7 +565,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
struct s5h1409_state *state = fe->demodulator_priv; struct s5h1409_state *state = fe->demodulator_priv;
u16 val; u16 val;
dprintk("%s(%d)\n", __FUNCTION__, mode); dprintk("%s(%d)\n", __func__, mode);
val = s5h1409_readreg(state, 0xac) & 0xcfff; val = s5h1409_readreg(state, 0xac) & 0xcfff;
switch (mode) { switch (mode) {
...@@ -573,7 +573,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode) ...@@ -573,7 +573,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
val |= 0x0000; val |= 0x0000;
break; break;
case S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK: case S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK:
dprintk("%s(%d) Mode1 or Defaulting\n", __FUNCTION__, mode); dprintk("%s(%d) Mode1 or Defaulting\n", __func__, mode);
val |= 0x1000; val |= 0x1000;
break; break;
case S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK: case S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK:
...@@ -597,7 +597,7 @@ static int s5h1409_init (struct dvb_frontend* fe) ...@@ -597,7 +597,7 @@ static int s5h1409_init (struct dvb_frontend* fe)
int i; int i;
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
s5h1409_sleep(fe, 0); s5h1409_sleep(fe, 0);
s5h1409_register_reset(fe); s5h1409_register_reset(fe);
...@@ -663,7 +663,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -663,7 +663,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
break; break;
} }
dprintk("%s() status 0x%08x\n", __FUNCTION__, *status); dprintk("%s() status 0x%08x\n", __func__, *status);
return 0; return 0;
} }
...@@ -671,7 +671,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -671,7 +671,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
{ {
int i, ret = -EINVAL; int i, ret = -EINVAL;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
for (i=0; i < ARRAY_SIZE(qam256_snr_tab); i++) { for (i=0; i < ARRAY_SIZE(qam256_snr_tab); i++) {
if (v < qam256_snr_tab[i].val) { if (v < qam256_snr_tab[i].val) {
...@@ -686,7 +686,7 @@ static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) ...@@ -686,7 +686,7 @@ static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
{ {
int i, ret = -EINVAL; int i, ret = -EINVAL;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
for (i=0; i < ARRAY_SIZE(qam64_snr_tab); i++) { for (i=0; i < ARRAY_SIZE(qam64_snr_tab); i++) {
if (v < qam64_snr_tab[i].val) { if (v < qam64_snr_tab[i].val) {
...@@ -701,7 +701,7 @@ static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) ...@@ -701,7 +701,7 @@ static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
{ {
int i, ret = -EINVAL; int i, ret = -EINVAL;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
for (i=0; i < ARRAY_SIZE(vsb_snr_tab); i++) { for (i=0; i < ARRAY_SIZE(vsb_snr_tab); i++) {
if (v > vsb_snr_tab[i].val) { if (v > vsb_snr_tab[i].val) {
...@@ -710,7 +710,7 @@ static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) ...@@ -710,7 +710,7 @@ static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
break; break;
} }
} }
dprintk("%s() snr=%d\n", __FUNCTION__, *snr); dprintk("%s() snr=%d\n", __func__, *snr);
return ret; return ret;
} }
...@@ -718,7 +718,7 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -718,7 +718,7 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)
{ {
struct s5h1409_state* state = fe->demodulator_priv; struct s5h1409_state* state = fe->demodulator_priv;
u16 reg; u16 reg;
dprintk("%s()\n", __FUNCTION__); dprintk("%s()\n", __func__);
switch(state->current_modulation) { switch(state->current_modulation) {
case QAM_64: case QAM_64:
...@@ -812,7 +812,7 @@ struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config, ...@@ -812,7 +812,7 @@ struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
if (s5h1409_init(&state->frontend) != 0) { if (s5h1409_init(&state->frontend) != 0) {
printk(KERN_ERR "%s: Failed to initialize correctly\n", printk(KERN_ERR "%s: Failed to initialize correctly\n",
__FUNCTION__); __func__);
goto error; goto error;
} }
......
drivers/media/dvb/frontends/s5h1409.h
View file @ 271ddbf7
...@@ -67,7 +67,7 @@ extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config, ...@@ -67,7 +67,7 @@ extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config, static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif /* CONFIG_DVB_S5H1409 */ #endif /* CONFIG_DVB_S5H1409 */
......
drivers/media/dvb/frontends/s5h1420.c
View file @ 271ddbf7
...@@ -63,7 +63,7 @@ static int s5h1420_writereg (struct s5h1420_state* state, u8 reg, u8 data) ...@@ -63,7 +63,7 @@ static int s5h1420_writereg (struct s5h1420_state* state, u8 reg, u8 data)
int err; int err;
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
return -EREMOTEIO; return -EREMOTEIO;
} }
......
drivers/media/dvb/frontends/s5h1420.h
View file @ 271ddbf7
...@@ -41,7 +41,7 @@ extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config, ...@@ -41,7 +41,7 @@ extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
static inline struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config, static inline struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_S5H1420 #endif // CONFIG_DVB_S5H1420
......
drivers/media/dvb/frontends/sp8870.c
View file @ 271ddbf7
...@@ -70,7 +70,7 @@ static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data) ...@@ -70,7 +70,7 @@ static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data)
int err; int err;
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -88,7 +88,7 @@ static int sp8870_readreg (struct sp8870_state* state, u16 reg) ...@@ -88,7 +88,7 @@ static int sp8870_readreg (struct sp8870_state* state, u16 reg)
ret = i2c_transfer (state->i2c, msg, 2); ret = i2c_transfer (state->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); dprintk("%s: readreg error (ret == %i)\n", __func__, ret);
return -1; return -1;
} }
...@@ -104,7 +104,7 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm ...@@ -104,7 +104,7 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm
int tx_len; int tx_len;
int err = 0; int err = 0;
dprintk ("%s: ...\n", __FUNCTION__); dprintk ("%s: ...\n", __func__);
if (fw->size < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET) if (fw->size < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET)
return -EINVAL; return -EINVAL;
...@@ -131,14 +131,14 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm ...@@ -131,14 +131,14 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm
msg.buf = tx_buf; msg.buf = tx_buf;
msg.len = tx_len + 2; msg.len = tx_len + 2;
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
printk("%s: firmware upload failed!\n", __FUNCTION__); printk("%s: firmware upload failed!\n", __func__);
printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err); printk ("%s: i2c error (err == %i)\n", __func__, err);
return err; return err;
} }
fw_pos += tx_len; fw_pos += tx_len;
} }
dprintk ("%s: done!\n", __FUNCTION__); dprintk ("%s: done!\n", __func__);
return 0; return 0;
}; };
...@@ -310,7 +310,7 @@ static int sp8870_init (struct dvb_frontend* fe) ...@@ -310,7 +310,7 @@ static int sp8870_init (struct dvb_frontend* fe)
if (state->initialised) return 0; if (state->initialised) return 0;
state->initialised = 1; state->initialised = 1;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
/* request the firmware, this will block until someone uploads it */ /* request the firmware, this will block until someone uploads it */
...@@ -475,7 +475,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par ...@@ -475,7 +475,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
int trials = 0; int trials = 0;
int check_count = 0; int check_count = 0;
dprintk("%s: frequency = %i\n", __FUNCTION__, p->frequency); dprintk("%s: frequency = %i\n", __func__, p->frequency);
for (trials = 1; trials <= MAXTRIALS; trials++) { for (trials = 1; trials <= MAXTRIALS; trials++) {
...@@ -487,7 +487,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par ...@@ -487,7 +487,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
valid = sp8870_read_data_valid_signal(state); valid = sp8870_read_data_valid_signal(state);
if (valid) { if (valid) {
dprintk("%s: delay = %i usec\n", dprintk("%s: delay = %i usec\n",
__FUNCTION__, check_count * 10); __func__, check_count * 10);
break; break;
} }
udelay(10); udelay(10);
...@@ -497,20 +497,20 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par ...@@ -497,20 +497,20 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
} }
if (!valid) { if (!valid) {
printk("%s: firmware crash!!!!!!\n", __FUNCTION__); printk("%s: firmware crash!!!!!!\n", __func__);
return -EIO; return -EIO;
} }
if (debug) { if (debug) {
if (valid) { if (valid) {
if (trials > 1) { if (trials > 1) {
printk("%s: firmware lockup!!!\n", __FUNCTION__); printk("%s: firmware lockup!!!\n", __func__);
printk("%s: recovered after %i trial(s))\n", __FUNCTION__, trials - 1); printk("%s: recovered after %i trial(s))\n", __func__, trials - 1);
lockups++; lockups++;
} }
} }
switches++; switches++;
printk("%s: switches = %i lockups = %i\n", __FUNCTION__, switches, lockups); printk("%s: switches = %i lockups = %i\n", __func__, switches, lockups);
} }
return 0; return 0;
......
drivers/media/dvb/frontends/sp8870.h
View file @ 271ddbf7
...@@ -42,7 +42,7 @@ extern struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, ...@@ -42,7 +42,7 @@ extern struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,
static inline struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, static inline struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_SP8870 #endif // CONFIG_DVB_SP8870
......
drivers/media/dvb/frontends/sp887x.c
View file @ 271ddbf7
...@@ -43,7 +43,7 @@ static int i2c_writebytes (struct sp887x_state* state, u8 *buf, u8 len) ...@@ -43,7 +43,7 @@ static int i2c_writebytes (struct sp887x_state* state, u8 *buf, u8 len)
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
printk ("%s: i2c write error (addr %02x, err == %i)\n", printk ("%s: i2c write error (addr %02x, err == %i)\n",
__FUNCTION__, state->config->demod_address, err); __func__, state->config->demod_address, err);
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -65,7 +65,7 @@ static int sp887x_writereg (struct sp887x_state* state, u16 reg, u16 data) ...@@ -65,7 +65,7 @@ static int sp887x_writereg (struct sp887x_state* state, u16 reg, u16 data)
{ {
printk("%s: writereg error " printk("%s: writereg error "
"(reg %03x, data %03x, ret == %i)\n", "(reg %03x, data %03x, ret == %i)\n",
__FUNCTION__, reg & 0xffff, data & 0xffff, ret); __func__, reg & 0xffff, data & 0xffff, ret);
return ret; return ret;
} }
} }
...@@ -82,7 +82,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg) ...@@ -82,7 +82,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
{ .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }}; { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); printk("%s: readreg error (ret == %i)\n", __func__, ret);
return -1; return -1;
} }
...@@ -91,7 +91,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg) ...@@ -91,7 +91,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
static void sp887x_microcontroller_stop (struct sp887x_state* state) static void sp887x_microcontroller_stop (struct sp887x_state* state)
{ {
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
sp887x_writereg(state, 0xf08, 0x000); sp887x_writereg(state, 0xf08, 0x000);
sp887x_writereg(state, 0xf09, 0x000); sp887x_writereg(state, 0xf09, 0x000);
...@@ -101,7 +101,7 @@ static void sp887x_microcontroller_stop (struct sp887x_state* state) ...@@ -101,7 +101,7 @@ static void sp887x_microcontroller_stop (struct sp887x_state* state)
static void sp887x_microcontroller_start (struct sp887x_state* state) static void sp887x_microcontroller_start (struct sp887x_state* state)
{ {
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
sp887x_writereg(state, 0xf08, 0x000); sp887x_writereg(state, 0xf08, 0x000);
sp887x_writereg(state, 0xf09, 0x000); sp887x_writereg(state, 0xf09, 0x000);
...@@ -112,7 +112,7 @@ static void sp887x_microcontroller_start (struct sp887x_state* state) ...@@ -112,7 +112,7 @@ static void sp887x_microcontroller_start (struct sp887x_state* state)
static void sp887x_setup_agc (struct sp887x_state* state) static void sp887x_setup_agc (struct sp887x_state* state)
{ {
/* setup AGC parameters */ /* setup AGC parameters */
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
sp887x_writereg(state, 0x33c, 0x054); sp887x_writereg(state, 0x33c, 0x054);
sp887x_writereg(state, 0x33b, 0x04c); sp887x_writereg(state, 0x33b, 0x04c);
sp887x_writereg(state, 0x328, 0x000); sp887x_writereg(state, 0x328, 0x000);
...@@ -142,7 +142,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware ...@@ -142,7 +142,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
int fw_size = fw->size; int fw_size = fw->size;
unsigned char *mem = fw->data; unsigned char *mem = fw->data;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
/* ignore the first 10 bytes, then we expect 0x4000 bytes of firmware */ /* ignore the first 10 bytes, then we expect 0x4000 bytes of firmware */
if (fw_size < FW_SIZE+10) if (fw_size < FW_SIZE+10)
...@@ -155,7 +155,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware ...@@ -155,7 +155,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
sp887x_microcontroller_stop (state); sp887x_microcontroller_stop (state);
printk ("%s: firmware upload... ", __FUNCTION__); printk ("%s: firmware upload... ", __func__);
/* setup write pointer to -1 (end of memory) */ /* setup write pointer to -1 (end of memory) */
/* bit 0x8000 in address is set to enable 13bit mode */ /* bit 0x8000 in address is set to enable 13bit mode */
...@@ -181,7 +181,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware ...@@ -181,7 +181,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
if ((err = i2c_writebytes (state, buf, c+2)) < 0) { if ((err = i2c_writebytes (state, buf, c+2)) < 0) {
printk ("failed.\n"); printk ("failed.\n");
printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err); printk ("%s: i2c error (err == %i)\n", __func__, err);
return err; return err;
} }
} }
......
drivers/media/dvb/frontends/sp887x.h
View file @ 271ddbf7
...@@ -24,7 +24,7 @@ extern struct dvb_frontend* sp887x_attach(const struct sp887x_config* config, ...@@ -24,7 +24,7 @@ extern struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
static inline struct dvb_frontend* sp887x_attach(const struct sp887x_config* config, static inline struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_SP887X #endif // CONFIG_DVB_SP887X
......
drivers/media/dvb/frontends/stv0297.c
View file @ 271ddbf7
...@@ -58,7 +58,7 @@ static int stv0297_writereg(struct stv0297_state *state, u8 reg, u8 data) ...@@ -58,7 +58,7 @@ static int stv0297_writereg(struct stv0297_state *state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, " dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, "
"ret == %i)\n", __FUNCTION__, reg, data, ret); "ret == %i)\n", __func__, reg, data, ret);
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
} }
...@@ -75,16 +75,16 @@ static int stv0297_readreg(struct stv0297_state *state, u8 reg) ...@@ -75,16 +75,16 @@ static int stv0297_readreg(struct stv0297_state *state, u8 reg)
// this device needs a STOP between the register and data // this device needs a STOP between the register and data
if (state->config->stop_during_read) { if (state->config->stop_during_read) {
if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) {
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret);
return -1; return -1;
} }
if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) {
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret);
return -1; return -1;
} }
} else { } else {
if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret);
return -1; return -1;
} }
} }
...@@ -115,16 +115,16 @@ static int stv0297_readregs(struct stv0297_state *state, u8 reg1, u8 * b, u8 len ...@@ -115,16 +115,16 @@ static int stv0297_readregs(struct stv0297_state *state, u8 reg1, u8 * b, u8 len
// this device needs a STOP between the register and data // this device needs a STOP between the register and data
if (state->config->stop_during_read) { if (state->config->stop_during_read) {
if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) {
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret);
return -1; return -1;
} }
if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) {
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret);
return -1; return -1;
} }
} else { } else {
if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret);
return -1; return -1;
} }
} }
......
drivers/media/dvb/frontends/stv0297.h
View file @ 271ddbf7
...@@ -49,7 +49,7 @@ extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config, ...@@ -49,7 +49,7 @@ extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
static inline struct dvb_frontend* stv0297_attach(const struct stv0297_config* config, static inline struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_STV0297 #endif // CONFIG_DVB_STV0297
......
drivers/media/dvb/frontends/stv0299.c
View file @ 271ddbf7
...@@ -86,7 +86,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data) ...@@ -86,7 +86,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, " dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, "
"ret == %i)\n", __FUNCTION__, reg, data, ret); "ret == %i)\n", __func__, reg, data, ret);
return (ret != 1) ? -EREMOTEIO : 0; return (ret != 1) ? -EREMOTEIO : 0;
} }
...@@ -113,7 +113,7 @@ static u8 stv0299_readreg (struct stv0299_state* state, u8 reg) ...@@ -113,7 +113,7 @@ static u8 stv0299_readreg (struct stv0299_state* state, u8 reg)
if (ret != 2) if (ret != 2)
dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",
__FUNCTION__, reg, ret); __func__, reg, ret);
return b1[0]; return b1[0];
} }
...@@ -127,14 +127,14 @@ static int stv0299_readregs (struct stv0299_state* state, u8 reg1, u8 *b, u8 len ...@@ -127,14 +127,14 @@ static int stv0299_readregs (struct stv0299_state* state, u8 reg1, u8 *b, u8 len
ret = i2c_transfer (state->i2c, msg, 2); ret = i2c_transfer (state->i2c, msg, 2);
if (ret != 2) if (ret != 2)
dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); dprintk("%s: readreg error (ret == %i)\n", __func__, ret);
return ret == 2 ? 0 : ret; return ret == 2 ? 0 : ret;
} }
static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec) static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec)
{ {
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
switch (fec) { switch (fec) {
case FEC_AUTO: case FEC_AUTO:
...@@ -174,7 +174,7 @@ static fe_code_rate_t stv0299_get_fec (struct stv0299_state* state) ...@@ -174,7 +174,7 @@ static fe_code_rate_t stv0299_get_fec (struct stv0299_state* state)
FEC_7_8, FEC_1_2 }; FEC_7_8, FEC_1_2 };
u8 index; u8 index;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
index = stv0299_readreg (state, 0x1b); index = stv0299_readreg (state, 0x1b);
index &= 0x7; index &= 0x7;
...@@ -189,11 +189,11 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout) ...@@ -189,11 +189,11 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
{ {
unsigned long start = jiffies; unsigned long start = jiffies;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
while (stv0299_readreg(state, 0x0a) & 1) { while (stv0299_readreg(state, 0x0a) & 1) {
if (jiffies - start > timeout) { if (jiffies - start > timeout) {
dprintk ("%s: timeout!!\n", __FUNCTION__); dprintk ("%s: timeout!!\n", __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
msleep(10); msleep(10);
...@@ -206,11 +206,11 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout) ...@@ -206,11 +206,11 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
{ {
unsigned long start = jiffies; unsigned long start = jiffies;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
while ((stv0299_readreg(state, 0x0a) & 3) != 2 ) { while ((stv0299_readreg(state, 0x0a) & 3) != 2 ) {
if (jiffies - start > timeout) { if (jiffies - start > timeout) {
dprintk ("%s: timeout!!\n", __FUNCTION__); dprintk ("%s: timeout!!\n", __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
msleep(10); msleep(10);
...@@ -245,7 +245,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state) ...@@ -245,7 +245,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
u8 sfr[3]; u8 sfr[3];
s8 rtf; s8 rtf;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
stv0299_readregs (state, 0x1f, sfr, 3); stv0299_readregs (state, 0x1f, sfr, 3);
stv0299_readregs (state, 0x1a, (u8 *)&rtf, 1); stv0299_readregs (state, 0x1a, (u8 *)&rtf, 1);
...@@ -257,8 +257,8 @@ static int stv0299_get_symbolrate (struct stv0299_state* state) ...@@ -257,8 +257,8 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
offset = (s32) rtf * (srate / 4096L); offset = (s32) rtf * (srate / 4096L);
offset /= 128; offset /= 128;
dprintk ("%s : srate = %i\n", __FUNCTION__, srate); dprintk ("%s : srate = %i\n", __func__, srate);
dprintk ("%s : ofset = %i\n", __FUNCTION__, offset); dprintk ("%s : ofset = %i\n", __func__, offset);
srate += offset; srate += offset;
...@@ -276,7 +276,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe, ...@@ -276,7 +276,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
u8 val; u8 val;
int i; int i;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (stv0299_wait_diseqc_idle (state, 100) < 0) if (stv0299_wait_diseqc_idle (state, 100) < 0)
return -ETIMEDOUT; return -ETIMEDOUT;
...@@ -305,7 +305,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t ...@@ -305,7 +305,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
struct stv0299_state* state = fe->demodulator_priv; struct stv0299_state* state = fe->demodulator_priv;
u8 val; u8 val;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (stv0299_wait_diseqc_idle (state, 100) < 0) if (stv0299_wait_diseqc_idle (state, 100) < 0)
return -ETIMEDOUT; return -ETIMEDOUT;
...@@ -355,7 +355,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag ...@@ -355,7 +355,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
u8 reg0x08; u8 reg0x08;
u8 reg0x0c; u8 reg0x0c;
dprintk("%s: %s\n", __FUNCTION__, dprintk("%s: %s\n", __func__,
voltage == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" : voltage == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
voltage == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??"); voltage == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");
...@@ -408,7 +408,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long ...@@ -408,7 +408,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long
cmd = cmd << 1; cmd = cmd << 1;
if (debug_legacy_dish_switch) if (debug_legacy_dish_switch)
printk ("%s switch command: 0x%04lx\n",__FUNCTION__, cmd); printk ("%s switch command: 0x%04lx\n",__func__, cmd);
do_gettimeofday (&nexttime); do_gettimeofday (&nexttime);
if (debug_legacy_dish_switch) if (debug_legacy_dish_switch)
...@@ -433,7 +433,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long ...@@ -433,7 +433,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long
} }
if (debug_legacy_dish_switch) { if (debug_legacy_dish_switch) {
printk ("%s(%d): switch delay (should be 32k followed by all 8k\n", printk ("%s(%d): switch delay (should be 32k followed by all 8k\n",
__FUNCTION__, fe->dvb->num); __func__, fe->dvb->num);
for (i = 1; i < 10; i++) for (i = 1; i < 10; i++)
printk ("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i])); printk ("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i]));
} }
...@@ -461,7 +461,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -461,7 +461,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
u8 signal = 0xff - stv0299_readreg (state, 0x18); u8 signal = 0xff - stv0299_readreg (state, 0x18);
u8 sync = stv0299_readreg (state, 0x1b); u8 sync = stv0299_readreg (state, 0x1b);
dprintk ("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __FUNCTION__, sync); dprintk ("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __func__, sync);
*status = 0; *status = 0;
if (signal > 10) if (signal > 10)
...@@ -499,7 +499,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength) ...@@ -499,7 +499,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
s32 signal = 0xffff - ((stv0299_readreg (state, 0x18) << 8) s32 signal = 0xffff - ((stv0299_readreg (state, 0x18) << 8)
| stv0299_readreg (state, 0x19)); | stv0299_readreg (state, 0x19));
dprintk ("%s : FE_READ_SIGNAL_STRENGTH : AGC2I: 0x%02x%02x, signal=0x%04x\n", __FUNCTION__, dprintk ("%s : FE_READ_SIGNAL_STRENGTH : AGC2I: 0x%02x%02x, signal=0x%04x\n", __func__,
stv0299_readreg (state, 0x18), stv0299_readreg (state, 0x18),
stv0299_readreg (state, 0x19), (int) signal); stv0299_readreg (state, 0x19), (int) signal);
...@@ -536,7 +536,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par ...@@ -536,7 +536,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
struct stv0299_state* state = fe->demodulator_priv; struct stv0299_state* state = fe->demodulator_priv;
int invval = 0; int invval = 0;
dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__); dprintk ("%s : FE_SET_FRONTEND\n", __func__);
// set the inversion // set the inversion
if (p->inversion == INVERSION_OFF) invval = 0; if (p->inversion == INVERSION_OFF) invval = 0;
......
drivers/media/dvb/frontends/stv0299.h
View file @ 271ddbf7
...@@ -96,7 +96,7 @@ extern struct dvb_frontend* stv0299_attach(const struct stv0299_config* config, ...@@ -96,7 +96,7 @@ extern struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
static inline struct dvb_frontend* stv0299_attach(const struct stv0299_config* config, static inline struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_STV0299 #endif // CONFIG_DVB_STV0299
......
drivers/media/dvb/frontends/tda10021.c
View file @ 271ddbf7
...@@ -79,7 +79,7 @@ static int _tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data) ...@@ -79,7 +79,7 @@ static int _tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
printk("DVB: TDA10021(%d): %s, writereg error " printk("DVB: TDA10021(%d): %s, writereg error "
"(reg == 0x%02x, val == 0x%02x, ret == %i)\n", "(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
state->frontend.dvb->num, __FUNCTION__, reg, data, ret); state->frontend.dvb->num, __func__, reg, data, ret);
msleep(10); msleep(10);
return (ret != 1) ? -EREMOTEIO : 0; return (ret != 1) ? -EREMOTEIO : 0;
...@@ -97,7 +97,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg) ...@@ -97,7 +97,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
// Don't print an error message if the id is read. // Don't print an error message if the id is read.
if (ret != 2 && reg != 0x1a) if (ret != 2 && reg != 0x1a)
printk("DVB: TDA10021: %s: readreg error (ret == %i)\n", printk("DVB: TDA10021: %s: readreg error (ret == %i)\n",
__FUNCTION__, ret); __func__, ret);
return b1[0]; return b1[0];
} }
......
drivers/media/dvb/frontends/tda10023.c
View file @ 271ddbf7
...@@ -118,7 +118,7 @@ static u8 tda10023_readreg (struct tda10023_state* state, u8 reg) ...@@ -118,7 +118,7 @@ static u8 tda10023_readreg (struct tda10023_state* state, u8 reg)
ret = i2c_transfer (state->i2c, msg, 2); ret = i2c_transfer (state->i2c, msg, 2);
if (ret != 2) if (ret != 2)
printk("DVB: TDA10023: %s: readreg error (ret == %i)\n", printk("DVB: TDA10023: %s: readreg error (ret == %i)\n",
__FUNCTION__, ret); __func__, ret);
return b1[0]; return b1[0];
} }
...@@ -132,7 +132,7 @@ static int tda10023_writereg (struct tda10023_state* state, u8 reg, u8 data) ...@@ -132,7 +132,7 @@ static int tda10023_writereg (struct tda10023_state* state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
printk("DVB: TDA10023(%d): %s, writereg error " printk("DVB: TDA10023(%d): %s, writereg error "
"(reg == 0x%02x, val == 0x%02x, ret == %i)\n", "(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
state->frontend.dvb->num, __FUNCTION__, reg, data, ret); state->frontend.dvb->num, __func__, reg, data, ret);
return (ret != 1) ? -EREMOTEIO : 0; return (ret != 1) ? -EREMOTEIO : 0;
} }
......
drivers/media/dvb/frontends/tda1002x.h
View file @ 271ddbf7
...@@ -40,7 +40,7 @@ extern struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config ...@@ -40,7 +40,7 @@ extern struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config
static inline struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config, static inline struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
struct i2c_adapter* i2c, u8 pwm) struct i2c_adapter* i2c, u8 pwm)
{ {
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 // CONFIG_DVB_TDA10021 #endif // CONFIG_DVB_TDA10021
...@@ -52,7 +52,7 @@ extern struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config ...@@ -52,7 +52,7 @@ extern struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config
static inline struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config, static inline struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config,
struct i2c_adapter* i2c, u8 pwm) struct i2c_adapter* i2c, u8 pwm)
{ {
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 // CONFIG_DVB_TDA10023 #endif // CONFIG_DVB_TDA10023
......
drivers/media/dvb/frontends/tda1004x.c
View file @ 271ddbf7
...@@ -131,16 +131,16 @@ static int tda1004x_write_byteI(struct tda1004x_state *state, int reg, int data) ...@@ -131,16 +131,16 @@ static int tda1004x_write_byteI(struct tda1004x_state *state, int reg, int data)
u8 buf[] = { reg, data }; u8 buf[] = { reg, data };
struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 }; struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 };
dprintk("%s: reg=0x%x, data=0x%x\n", __FUNCTION__, reg, data); dprintk("%s: reg=0x%x, data=0x%x\n", __func__, reg, data);
msg.addr = state->config->demod_address; msg.addr = state->config->demod_address;
ret = i2c_transfer(state->i2c, &msg, 1); ret = i2c_transfer(state->i2c, &msg, 1);
if (ret != 1) if (ret != 1)
dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n", dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
__FUNCTION__, reg, data, ret); __func__, reg, data, ret);
dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __FUNCTION__, dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __func__,
reg, data, ret); reg, data, ret);
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
} }
...@@ -153,19 +153,19 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg) ...@@ -153,19 +153,19 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg)
struct i2c_msg msg[] = {{ .flags = 0, .buf = b0, .len = 1 }, struct i2c_msg msg[] = {{ .flags = 0, .buf = b0, .len = 1 },
{ .flags = I2C_M_RD, .buf = b1, .len = 1 }}; { .flags = I2C_M_RD, .buf = b1, .len = 1 }};
dprintk("%s: reg=0x%x\n", __FUNCTION__, reg); dprintk("%s: reg=0x%x\n", __func__, reg);
msg[0].addr = state->config->demod_address; msg[0].addr = state->config->demod_address;
msg[1].addr = state->config->demod_address; msg[1].addr = state->config->demod_address;
ret = i2c_transfer(state->i2c, msg, 2); ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
dprintk("%s: error reg=0x%x, ret=%i\n", __FUNCTION__, reg, dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg,
ret); ret);
return -1; return -1;
} }
dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __FUNCTION__, dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __func__,
reg, b1[0], ret); reg, b1[0], ret);
return b1[0]; return b1[0];
} }
...@@ -173,7 +173,7 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg) ...@@ -173,7 +173,7 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg)
static int tda1004x_write_mask(struct tda1004x_state *state, int reg, int mask, int data) static int tda1004x_write_mask(struct tda1004x_state *state, int reg, int mask, int data)
{ {
int val; int val;
dprintk("%s: reg=0x%x, mask=0x%x, data=0x%x\n", __FUNCTION__, reg, dprintk("%s: reg=0x%x, mask=0x%x, data=0x%x\n", __func__, reg,
mask, data); mask, data);
// read a byte and check // read a byte and check
...@@ -194,7 +194,7 @@ static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned ch ...@@ -194,7 +194,7 @@ static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned ch
int i; int i;
int result; int result;
dprintk("%s: reg=0x%x, len=0x%x\n", __FUNCTION__, reg, len); dprintk("%s: reg=0x%x, len=0x%x\n", __func__, reg, len);
result = 0; result = 0;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
...@@ -209,7 +209,7 @@ static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned ch ...@@ -209,7 +209,7 @@ static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned ch
static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state) static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state)
{ {
int result; int result;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
result = tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 2); result = tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 2);
msleep(20); msleep(20);
...@@ -218,7 +218,7 @@ static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state) ...@@ -218,7 +218,7 @@ static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state)
static int tda1004x_disable_tuner_i2c(struct tda1004x_state *state) static int tda1004x_disable_tuner_i2c(struct tda1004x_state *state)
{ {
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
return tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 0); return tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 0);
} }
...@@ -345,7 +345,7 @@ static int tda1004x_do_upload(struct tda1004x_state *state, ...@@ -345,7 +345,7 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
} }
pos += tx_size; pos += tx_size;
dprintk("%s: fw_pos=0x%x\n", __FUNCTION__, pos); dprintk("%s: fw_pos=0x%x\n", __func__, pos);
} }
// give the DSP a chance to settle 03/10/05 Hac // give the DSP a chance to settle 03/10/05 Hac
msleep(100); msleep(100);
...@@ -444,10 +444,10 @@ static void tda10046_init_plls(struct dvb_frontend* fe) ...@@ -444,10 +444,10 @@ static void tda10046_init_plls(struct dvb_frontend* fe)
tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 0x03); // PLL M = 3 tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 0x03); // PLL M = 3
} }
if (state->config->xtal_freq == TDA10046_XTAL_4M ) { if (state->config->xtal_freq == TDA10046_XTAL_4M ) {
dprintk("%s: setting up PLLs for a 4 MHz Xtal\n", __FUNCTION__); dprintk("%s: setting up PLLs for a 4 MHz Xtal\n", __func__);
tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0
} else { } else {
dprintk("%s: setting up PLLs for a 16 MHz Xtal\n", __FUNCTION__); dprintk("%s: setting up PLLs for a 16 MHz Xtal\n", __func__);
tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 3); // PLL P = 0, N = 3 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 3); // PLL P = 0, N = 3
} }
if(tda10046_clk53m) if(tda10046_clk53m)
...@@ -488,7 +488,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe) ...@@ -488,7 +488,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
if (state->config->xtal_freq == TDA10046_XTAL_4M) { if (state->config->xtal_freq == TDA10046_XTAL_4M) {
tda1004x_write_byteI(state, TDA1004X_CONFC4, 0); tda1004x_write_byteI(state, TDA1004X_CONFC4, 0);
} else { } else {
dprintk("%s: 16MHz Xtal, reducing I2C speed\n", __FUNCTION__); dprintk("%s: 16MHz Xtal, reducing I2C speed\n", __func__);
tda1004x_write_byteI(state, TDA1004X_CONFC4, 0x80); tda1004x_write_byteI(state, TDA1004X_CONFC4, 0x80);
} }
tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 1, 0); tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 1, 0);
...@@ -594,7 +594,7 @@ static int tda10045_init(struct dvb_frontend* fe) ...@@ -594,7 +594,7 @@ static int tda10045_init(struct dvb_frontend* fe)
{ {
struct tda1004x_state* state = fe->demodulator_priv; struct tda1004x_state* state = fe->demodulator_priv;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
if (tda10045_fwupload(fe)) { if (tda10045_fwupload(fe)) {
printk("tda1004x: firmware upload failed\n"); printk("tda1004x: firmware upload failed\n");
...@@ -624,7 +624,7 @@ static int tda10045_init(struct dvb_frontend* fe) ...@@ -624,7 +624,7 @@ static int tda10045_init(struct dvb_frontend* fe)
static int tda10046_init(struct dvb_frontend* fe) static int tda10046_init(struct dvb_frontend* fe)
{ {
struct tda1004x_state* state = fe->demodulator_priv; struct tda1004x_state* state = fe->demodulator_priv;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
if (tda10046_fwupload(fe)) { if (tda10046_fwupload(fe)) {
printk("tda1004x: firmware upload failed\n"); printk("tda1004x: firmware upload failed\n");
...@@ -686,7 +686,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe, ...@@ -686,7 +686,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
int tmp; int tmp;
int inversion; int inversion;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
if (state->demod_type == TDA1004X_DEMOD_TDA10046) { if (state->demod_type == TDA1004X_DEMOD_TDA10046) {
// setup auto offset // setup auto offset
...@@ -881,7 +881,7 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete ...@@ -881,7 +881,7 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete
{ {
struct tda1004x_state* state = fe->demodulator_priv; struct tda1004x_state* state = fe->demodulator_priv;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
// inversion status // inversion status
fe_params->inversion = INVERSION_OFF; fe_params->inversion = INVERSION_OFF;
...@@ -989,7 +989,7 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status ...@@ -989,7 +989,7 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status
int cber; int cber;
int vber; int vber;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
// read status // read status
status = tda1004x_read_byte(state, TDA1004X_STATUS_CD); status = tda1004x_read_byte(state, TDA1004X_STATUS_CD);
...@@ -1048,7 +1048,7 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status ...@@ -1048,7 +1048,7 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status
} }
// success // success
dprintk("%s: fe_status=0x%x\n", __FUNCTION__, *fe_status); dprintk("%s: fe_status=0x%x\n", __func__, *fe_status);
return 0; return 0;
} }
...@@ -1058,7 +1058,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal) ...@@ -1058,7 +1058,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
int tmp; int tmp;
int reg = 0; int reg = 0;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
// determine the register to use // determine the register to use
switch (state->demod_type) { switch (state->demod_type) {
...@@ -1077,7 +1077,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal) ...@@ -1077,7 +1077,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
return -EIO; return -EIO;
*signal = (tmp << 8) | tmp; *signal = (tmp << 8) | tmp;
dprintk("%s: signal=0x%x\n", __FUNCTION__, *signal); dprintk("%s: signal=0x%x\n", __func__, *signal);
return 0; return 0;
} }
...@@ -1086,7 +1086,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr) ...@@ -1086,7 +1086,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
struct tda1004x_state* state = fe->demodulator_priv; struct tda1004x_state* state = fe->demodulator_priv;
int tmp; int tmp;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
// read it // read it
tmp = tda1004x_read_byte(state, TDA1004X_SNR); tmp = tda1004x_read_byte(state, TDA1004X_SNR);
...@@ -1095,7 +1095,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr) ...@@ -1095,7 +1095,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
tmp = 255 - tmp; tmp = 255 - tmp;
*snr = ((tmp << 8) | tmp); *snr = ((tmp << 8) | tmp);
dprintk("%s: snr=0x%x\n", __FUNCTION__, *snr); dprintk("%s: snr=0x%x\n", __func__, *snr);
return 0; return 0;
} }
...@@ -1106,7 +1106,7 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) ...@@ -1106,7 +1106,7 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
int tmp2; int tmp2;
int counter; int counter;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
// read the UCBLOCKS and reset // read the UCBLOCKS and reset
counter = 0; counter = 0;
...@@ -1132,7 +1132,7 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) ...@@ -1132,7 +1132,7 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
else else
*ucblocks = 0xffffffff; *ucblocks = 0xffffffff;
dprintk("%s: ucblocks=0x%x\n", __FUNCTION__, *ucblocks); dprintk("%s: ucblocks=0x%x\n", __func__, *ucblocks);
return 0; return 0;
} }
...@@ -1141,7 +1141,7 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber) ...@@ -1141,7 +1141,7 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber)
struct tda1004x_state* state = fe->demodulator_priv; struct tda1004x_state* state = fe->demodulator_priv;
int tmp; int tmp;
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __func__);
// read it in // read it in
tmp = tda1004x_read_byte(state, TDA1004X_CBER_LSB); tmp = tda1004x_read_byte(state, TDA1004X_CBER_LSB);
...@@ -1155,7 +1155,7 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber) ...@@ -1155,7 +1155,7 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber)
// The address 0x20 should be read to cope with a TDA10046 bug // The address 0x20 should be read to cope with a TDA10046 bug
tda1004x_read_byte(state, TDA1004X_CBER_RESET); tda1004x_read_byte(state, TDA1004X_CBER_RESET);
dprintk("%s: ber=0x%x\n", __FUNCTION__, *ber); dprintk("%s: ber=0x%x\n", __func__, *ber);
return 0; return 0;
} }
......
drivers/media/dvb/frontends/tda1004x.h
View file @ 271ddbf7
...@@ -127,13 +127,13 @@ extern struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config ...@@ -127,13 +127,13 @@ extern struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config
static inline struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config, static inline struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
static inline struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config, static inline struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_TDA1004X #endif // CONFIG_DVB_TDA1004X
......
drivers/media/dvb/frontends/tda10086.c
View file @ 271ddbf7
...@@ -60,7 +60,7 @@ static int tda10086_write_byte(struct tda10086_state *state, int reg, int data) ...@@ -60,7 +60,7 @@ static int tda10086_write_byte(struct tda10086_state *state, int reg, int data)
if (ret != 1) if (ret != 1)
dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n", dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
__FUNCTION__, reg, data, ret); __func__, reg, data, ret);
return (ret != 1) ? ret : 0; return (ret != 1) ? ret : 0;
} }
...@@ -78,7 +78,7 @@ static int tda10086_read_byte(struct tda10086_state *state, int reg) ...@@ -78,7 +78,7 @@ static int tda10086_read_byte(struct tda10086_state *state, int reg)
ret = i2c_transfer(state->i2c, msg, 2); ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2) { if (ret != 2) {
dprintk("%s: error reg=0x%x, ret=%i\n", __FUNCTION__, reg, dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg,
ret); ret);
return ret; return ret;
} }
...@@ -108,7 +108,7 @@ static int tda10086_init(struct dvb_frontend* fe) ...@@ -108,7 +108,7 @@ static int tda10086_init(struct dvb_frontend* fe)
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
u8 t22k_off = 0x80; u8 t22k_off = 0x80;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (state->config->diseqc_tone) if (state->config->diseqc_tone)
t22k_off = 0; t22k_off = 0;
...@@ -173,7 +173,7 @@ static void tda10086_diseqc_wait(struct tda10086_state *state) ...@@ -173,7 +173,7 @@ static void tda10086_diseqc_wait(struct tda10086_state *state)
unsigned long timeout = jiffies + msecs_to_jiffies(200); unsigned long timeout = jiffies + msecs_to_jiffies(200);
while (!(tda10086_read_byte(state, 0x50) & 0x01)) { while (!(tda10086_read_byte(state, 0x50) & 0x01)) {
if(time_after(jiffies, timeout)) { if(time_after(jiffies, timeout)) {
printk("%s: diseqc queue not ready, command may be lost.\n", __FUNCTION__); printk("%s: diseqc queue not ready, command may be lost.\n", __func__);
break; break;
} }
msleep(10); msleep(10);
...@@ -185,7 +185,7 @@ static int tda10086_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone) ...@@ -185,7 +185,7 @@ static int tda10086_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
u8 t22k_off = 0x80; u8 t22k_off = 0x80;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (state->config->diseqc_tone) if (state->config->diseqc_tone)
t22k_off = 0; t22k_off = 0;
...@@ -211,7 +211,7 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe, ...@@ -211,7 +211,7 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,
u8 oldval; u8 oldval;
u8 t22k_off = 0x80; u8 t22k_off = 0x80;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (state->config->diseqc_tone) if (state->config->diseqc_tone)
t22k_off = 0; t22k_off = 0;
...@@ -239,7 +239,7 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic ...@@ -239,7 +239,7 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic
u8 oldval = tda10086_read_byte(state, 0x36); u8 oldval = tda10086_read_byte(state, 0x36);
u8 t22k_off = 0x80; u8 t22k_off = 0x80;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (state->config->diseqc_tone) if (state->config->diseqc_tone)
t22k_off = 0; t22k_off = 0;
...@@ -266,7 +266,7 @@ static int tda10086_set_inversion(struct tda10086_state *state, ...@@ -266,7 +266,7 @@ static int tda10086_set_inversion(struct tda10086_state *state,
{ {
u8 invval = 0x80; u8 invval = 0x80;
dprintk ("%s %i %i\n", __FUNCTION__, fe_params->inversion, state->config->invert); dprintk ("%s %i %i\n", __func__, fe_params->inversion, state->config->invert);
switch(fe_params->inversion) { switch(fe_params->inversion) {
case INVERSION_OFF: case INVERSION_OFF:
...@@ -300,7 +300,7 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state, ...@@ -300,7 +300,7 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state,
u32 bdri; u32 bdri;
u32 symbol_rate = fe_params->u.qpsk.symbol_rate; u32 symbol_rate = fe_params->u.qpsk.symbol_rate;
dprintk ("%s %i\n", __FUNCTION__, symbol_rate); dprintk ("%s %i\n", __func__, symbol_rate);
// setup the decimation and anti-aliasing filters.. // setup the decimation and anti-aliasing filters..
if (symbol_rate < (u32) (SACLK * 0.0137)) { if (symbol_rate < (u32) (SACLK * 0.0137)) {
...@@ -366,7 +366,7 @@ static int tda10086_set_fec(struct tda10086_state *state, ...@@ -366,7 +366,7 @@ static int tda10086_set_fec(struct tda10086_state *state,
{ {
u8 fecval; u8 fecval;
dprintk ("%s %i\n", __FUNCTION__, fe_params->u.qpsk.fec_inner); dprintk ("%s %i\n", __func__, fe_params->u.qpsk.fec_inner);
switch(fe_params->u.qpsk.fec_inner) { switch(fe_params->u.qpsk.fec_inner) {
case FEC_1_2: case FEC_1_2:
...@@ -412,7 +412,7 @@ static int tda10086_set_frontend(struct dvb_frontend* fe, ...@@ -412,7 +412,7 @@ static int tda10086_set_frontend(struct dvb_frontend* fe,
u32 freq = 0; u32 freq = 0;
int freqoff; int freqoff;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
// modify parameters for tuning // modify parameters for tuning
tda10086_write_byte(state, 0x02, 0x35); tda10086_write_byte(state, 0x02, 0x35);
...@@ -459,7 +459,7 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa ...@@ -459,7 +459,7 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
int tmp; int tmp;
u64 tmp64; u64 tmp64;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
// check for invalid symbol rate // check for invalid symbol rate
if (fe_params->u.qpsk.symbol_rate < 500000) if (fe_params->u.qpsk.symbol_rate < 500000)
...@@ -550,7 +550,7 @@ static int tda10086_read_status(struct dvb_frontend* fe, fe_status_t *fe_status) ...@@ -550,7 +550,7 @@ static int tda10086_read_status(struct dvb_frontend* fe, fe_status_t *fe_status)
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
u8 val; u8 val;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
val = tda10086_read_byte(state, 0x0e); val = tda10086_read_byte(state, 0x0e);
*fe_status = 0; *fe_status = 0;
...@@ -579,7 +579,7 @@ static int tda10086_read_signal_strength(struct dvb_frontend* fe, u16 * signal) ...@@ -579,7 +579,7 @@ static int tda10086_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
u8 _str; u8 _str;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
_str = 0xff - tda10086_read_byte(state, 0x43); _str = 0xff - tda10086_read_byte(state, 0x43);
*signal = (_str << 8) | _str; *signal = (_str << 8) | _str;
...@@ -592,7 +592,7 @@ static int tda10086_read_snr(struct dvb_frontend* fe, u16 * snr) ...@@ -592,7 +592,7 @@ static int tda10086_read_snr(struct dvb_frontend* fe, u16 * snr)
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
u8 _snr; u8 _snr;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
_snr = 0xff - tda10086_read_byte(state, 0x1c); _snr = 0xff - tda10086_read_byte(state, 0x1c);
*snr = (_snr << 8) | _snr; *snr = (_snr << 8) | _snr;
...@@ -604,7 +604,7 @@ static int tda10086_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) ...@@ -604,7 +604,7 @@ static int tda10086_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
{ {
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
// read it // read it
*ucblocks = tda10086_read_byte(state, 0x18) & 0x7f; *ucblocks = tda10086_read_byte(state, 0x18) & 0x7f;
...@@ -620,7 +620,7 @@ static int tda10086_read_ber(struct dvb_frontend* fe, u32* ber) ...@@ -620,7 +620,7 @@ static int tda10086_read_ber(struct dvb_frontend* fe, u32* ber)
{ {
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
// read it // read it
*ber = 0; *ber = 0;
...@@ -635,7 +635,7 @@ static int tda10086_sleep(struct dvb_frontend* fe) ...@@ -635,7 +635,7 @@ static int tda10086_sleep(struct dvb_frontend* fe)
{ {
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
tda10086_write_mask(state, 0x00, 0x08, 0x08); tda10086_write_mask(state, 0x00, 0x08, 0x08);
...@@ -646,7 +646,7 @@ static int tda10086_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) ...@@ -646,7 +646,7 @@ static int tda10086_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
{ {
struct tda10086_state* state = fe->demodulator_priv; struct tda10086_state* state = fe->demodulator_priv;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
if (enable) { if (enable) {
tda10086_write_mask(state, 0x00, 0x10, 0x10); tda10086_write_mask(state, 0x00, 0x10, 0x10);
...@@ -737,7 +737,7 @@ struct dvb_frontend* tda10086_attach(const struct tda10086_config* config, ...@@ -737,7 +737,7 @@ struct dvb_frontend* tda10086_attach(const struct tda10086_config* config,
{ {
struct tda10086_state *state; struct tda10086_state *state;
dprintk ("%s\n", __FUNCTION__); dprintk ("%s\n", __func__);
/* allocate memory for the internal state */ /* allocate memory for the internal state */
state = kmalloc(sizeof(struct tda10086_state), GFP_KERNEL); state = kmalloc(sizeof(struct tda10086_state), GFP_KERNEL);
......
drivers/media/dvb/frontends/tda10086.h
View file @ 271ddbf7
...@@ -45,7 +45,7 @@ extern struct dvb_frontend* tda10086_attach(const struct tda10086_config* config ...@@ -45,7 +45,7 @@ extern struct dvb_frontend* tda10086_attach(const struct tda10086_config* config
static inline struct dvb_frontend* tda10086_attach(const struct tda10086_config* config, static inline struct dvb_frontend* tda10086_attach(const struct tda10086_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_TDA10086 #endif // CONFIG_DVB_TDA10086
......
drivers/media/dvb/frontends/tda18271-priv.h
View file @ 271ddbf7
...@@ -139,7 +139,7 @@ extern int tda18271_debug; ...@@ -139,7 +139,7 @@ extern int tda18271_debug;
#define DBG_CAL 16 #define DBG_CAL 16
#define tda_printk(kern, fmt, arg...) \ #define tda_printk(kern, fmt, arg...) \
printk(kern "%s: " fmt, __FUNCTION__, ##arg) printk(kern "%s: " fmt, __func__, ##arg)
#define dprintk(kern, lvl, fmt, arg...) do {\ #define dprintk(kern, lvl, fmt, arg...) do {\
if (tda18271_debug & lvl) \ if (tda18271_debug & lvl) \
......
drivers/media/dvb/frontends/tda18271.h
View file @ 271ddbf7
...@@ -91,7 +91,7 @@ static inline struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, ...@@ -91,7 +91,7 @@ static inline struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct i2c_adapter *i2c,
struct tda18271_config *cfg) struct tda18271_config *cfg)
{ {
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
......
drivers/media/dvb/frontends/tda8083.c
View file @ 271ddbf7
...@@ -68,7 +68,7 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data) ...@@ -68,7 +68,7 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
dprintk ("%s: writereg error (reg %02x, ret == %i)\n", dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
__FUNCTION__, reg, ret); __func__, reg, ret);
return (ret != 1) ? -1 : 0; return (ret != 1) ? -1 : 0;
} }
...@@ -83,7 +83,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len ...@@ -83,7 +83,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len
if (ret != 2) if (ret != 2)
dprintk ("%s: readreg error (reg %02x, ret == %i)\n", dprintk ("%s: readreg error (reg %02x, ret == %i)\n",
__FUNCTION__, reg1, ret); __func__, reg1, ret);
return ret == 2 ? 0 : -1; return ret == 2 ? 0 : -1;
} }
......
drivers/media/dvb/frontends/tda8083.h
View file @ 271ddbf7
...@@ -42,7 +42,7 @@ extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config, ...@@ -42,7 +42,7 @@ extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
static inline struct dvb_frontend* tda8083_attach(const struct tda8083_config* config, static inline struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_TDA8083 #endif // CONFIG_DVB_TDA8083
......
drivers/media/dvb/frontends/tda826x.c
View file @ 271ddbf7
...@@ -54,7 +54,7 @@ static int tda826x_sleep(struct dvb_frontend *fe) ...@@ -54,7 +54,7 @@ static int tda826x_sleep(struct dvb_frontend *fe)
u8 buf [] = { 0x00, 0x8d }; u8 buf [] = { 0x00, 0x8d };
struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 2 }; struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 2 };
dprintk("%s:\n", __FUNCTION__); dprintk("%s:\n", __func__);
if (!priv->has_loopthrough) if (!priv->has_loopthrough)
buf[1] = 0xad; buf[1] = 0xad;
...@@ -62,7 +62,7 @@ static int tda826x_sleep(struct dvb_frontend *fe) ...@@ -62,7 +62,7 @@ static int tda826x_sleep(struct dvb_frontend *fe)
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) { if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) {
dprintk("%s: i2c error\n", __FUNCTION__); dprintk("%s: i2c error\n", __func__);
} }
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
...@@ -78,7 +78,7 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param ...@@ -78,7 +78,7 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param
u8 buf [11]; u8 buf [11];
struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 11 }; struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 11 };
dprintk("%s:\n", __FUNCTION__); dprintk("%s:\n", __func__);
div = (params->frequency + (1000-1)) / 1000; div = (params->frequency + (1000-1)) / 1000;
...@@ -99,7 +99,7 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param ...@@ -99,7 +99,7 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) { if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) {
dprintk("%s: i2c error\n", __FUNCTION__); dprintk("%s: i2c error\n", __func__);
} }
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
...@@ -138,7 +138,7 @@ struct dvb_frontend *tda826x_attach(struct dvb_frontend *fe, int addr, struct i2 ...@@ -138,7 +138,7 @@ struct dvb_frontend *tda826x_attach(struct dvb_frontend *fe, int addr, struct i2
}; };
int ret; int ret;
dprintk("%s:\n", __FUNCTION__); dprintk("%s:\n", __func__);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
......
drivers/media/dvb/frontends/tda826x.h
View file @ 271ddbf7
...@@ -45,7 +45,7 @@ static inline struct dvb_frontend* tda826x_attach(struct dvb_frontend *fe, ...@@ -45,7 +45,7 @@ static inline struct dvb_frontend* tda826x_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct i2c_adapter *i2c,
int has_loopthrough) int has_loopthrough)
{ {
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 // CONFIG_DVB_TDA826X #endif // CONFIG_DVB_TDA826X
......
drivers/media/dvb/frontends/tda827x.h
View file @ 271ddbf7
...@@ -61,7 +61,7 @@ static inline struct dvb_frontend* tda827x_attach(struct dvb_frontend *fe, ...@@ -61,7 +61,7 @@ static inline struct dvb_frontend* tda827x_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct i2c_adapter *i2c,
struct tda827x_config *cfg) struct tda827x_config *cfg)
{ {
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 // CONFIG_DVB_TDA827X #endif // CONFIG_DVB_TDA827X
......
drivers/media/dvb/frontends/tua6100.c
View file @ 271ddbf7
...@@ -58,7 +58,7 @@ static int tua6100_sleep(struct dvb_frontend *fe) ...@@ -58,7 +58,7 @@ static int tua6100_sleep(struct dvb_frontend *fe)
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) { if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) {
printk("%s: i2c error\n", __FUNCTION__); printk("%s: i2c error\n", __func__);
} }
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
......
drivers/media/dvb/frontends/tua6100.h
View file @ 271ddbf7
...@@ -39,7 +39,7 @@ extern struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, st ...@@ -39,7 +39,7 @@ extern struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, st
#else #else
static inline struct dvb_frontend* tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c) static inline struct dvb_frontend* tua6100_attach(struct dvb_frontend *fe, int addr, 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; return NULL;
} }
#endif // CONFIG_DVB_TUA6100 #endif // CONFIG_DVB_TUA6100
......
drivers/media/dvb/frontends/ves1820.c
View file @ 271ddbf7
...@@ -66,7 +66,7 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data) ...@@ -66,7 +66,7 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
if (ret != 1) if (ret != 1)
printk("ves1820: %s(): writereg error (reg == 0x%02x, " printk("ves1820: %s(): writereg error (reg == 0x%02x, "
"val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret); "val == 0x%02x, ret == %i)\n", __func__, reg, data, ret);
return (ret != 1) ? -EREMOTEIO : 0; return (ret != 1) ? -EREMOTEIO : 0;
} }
...@@ -85,7 +85,7 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg) ...@@ -85,7 +85,7 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
if (ret != 2) if (ret != 2)
printk("ves1820: %s(): readreg error (reg == 0x%02x, " printk("ves1820: %s(): readreg error (reg == 0x%02x, "
"ret == %i)\n", __FUNCTION__, reg, ret); "ret == %i)\n", __func__, reg, ret);
return b1[0]; return b1[0];
} }
......
drivers/media/dvb/frontends/ves1820.h
View file @ 271ddbf7
...@@ -48,7 +48,7 @@ extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config, ...@@ -48,7 +48,7 @@ extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
static inline struct dvb_frontend* ves1820_attach(const struct ves1820_config* config, static inline struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
struct i2c_adapter* i2c, u8 pwm) struct i2c_adapter* i2c, u8 pwm)
{ {
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 // CONFIG_DVB_VES1820 #endif // CONFIG_DVB_VES1820
......
drivers/media/dvb/frontends/ves1x93.c
View file @ 271ddbf7
...@@ -98,7 +98,7 @@ static int ves1x93_writereg (struct ves1x93_state* state, u8 reg, u8 data) ...@@ -98,7 +98,7 @@ static int ves1x93_writereg (struct ves1x93_state* state, u8 reg, u8 data)
int err; int err;
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
return -EREMOTEIO; return -EREMOTEIO;
} }
...@@ -179,7 +179,7 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate) ...@@ -179,7 +179,7 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
u32 tmp; u32 tmp;
u32 FIN; u32 FIN;
dprintk("%s: srate == %d\n", __FUNCTION__, (unsigned int) srate); dprintk("%s: srate == %d\n", __func__, (unsigned int) srate);
if (srate > state->config->xin/2) if (srate > state->config->xin/2)
srate = state->config->xin/2; srate = state->config->xin/2;
...@@ -266,7 +266,7 @@ static int ves1x93_init (struct dvb_frontend* fe) ...@@ -266,7 +266,7 @@ static int ves1x93_init (struct dvb_frontend* fe)
int i; int i;
int val; int val;
dprintk("%s: init chip\n", __FUNCTION__); dprintk("%s: init chip\n", __func__);
for (i = 0; i < state->tab_size; i++) { for (i = 0; i < state->tab_size; i++) {
if (state->init_1x93_wtab[i]) { if (state->init_1x93_wtab[i]) {
......
drivers/media/dvb/frontends/ves1x93.h
View file @ 271ddbf7
...@@ -47,7 +47,7 @@ extern struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config, ...@@ -47,7 +47,7 @@ extern struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
static inline struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config, static inline struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
struct i2c_adapter* i2c) 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; return NULL;
} }
#endif // CONFIG_DVB_VES1X93 #endif // CONFIG_DVB_VES1X93
......
drivers/media/dvb/frontends/xc5000.c
View file @ 271ddbf7
...@@ -209,7 +209,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe) ...@@ -209,7 +209,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
int ret; int ret;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
if (priv->cfg->tuner_callback) { if (priv->cfg->tuner_callback) {
ret = priv->cfg->tuner_callback(priv->cfg->priv, ret = priv->cfg->tuner_callback(priv->cfg->priv,
...@@ -330,7 +330,7 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, u8 i2c_sequence[]) ...@@ -330,7 +330,7 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, u8 i2c_sequence[])
static int xc_initialize(struct xc5000_priv *priv) static int xc_initialize(struct xc5000_priv *priv)
{ {
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
return xc_write_reg(priv, XREG_INIT, 0); return xc_write_reg(priv, XREG_INIT, 0);
} }
...@@ -338,9 +338,9 @@ static int xc_SetTVStandard(struct xc5000_priv *priv, ...@@ -338,9 +338,9 @@ static int xc_SetTVStandard(struct xc5000_priv *priv,
u16 VideoMode, u16 AudioMode) u16 VideoMode, u16 AudioMode)
{ {
int ret; int ret;
dprintk(1, "%s(0x%04x,0x%04x)\n", __FUNCTION__, VideoMode, AudioMode); dprintk(1, "%s(0x%04x,0x%04x)\n", __func__, VideoMode, AudioMode);
dprintk(1, "%s() Standard = %s\n", dprintk(1, "%s() Standard = %s\n",
__FUNCTION__, __func__,
XC5000_Standard[priv->video_standard].Name); XC5000_Standard[priv->video_standard].Name);
ret = xc_write_reg(priv, XREG_VIDEO_MODE, VideoMode); ret = xc_write_reg(priv, XREG_VIDEO_MODE, VideoMode);
...@@ -361,7 +361,7 @@ static int xc_shutdown(struct xc5000_priv *priv) ...@@ -361,7 +361,7 @@ static int xc_shutdown(struct xc5000_priv *priv)
static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode) static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode)
{ {
dprintk(1, "%s(%d) Source = %s\n", __FUNCTION__, rf_mode, dprintk(1, "%s(%d) Source = %s\n", __func__, rf_mode,
rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE"); rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE");
if ((rf_mode != XC_RF_MODE_AIR) && (rf_mode != XC_RF_MODE_CABLE)) if ((rf_mode != XC_RF_MODE_AIR) && (rf_mode != XC_RF_MODE_CABLE))
...@@ -369,7 +369,7 @@ static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode) ...@@ -369,7 +369,7 @@ static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode)
rf_mode = XC_RF_MODE_CABLE; rf_mode = XC_RF_MODE_CABLE;
printk(KERN_ERR printk(KERN_ERR
"%s(), Invalid mode, defaulting to CABLE", "%s(), Invalid mode, defaulting to CABLE",
__FUNCTION__); __func__);
} }
return xc_write_reg(priv, XREG_SIGNALSOURCE, rf_mode); return xc_write_reg(priv, XREG_SIGNALSOURCE, rf_mode);
} }
...@@ -380,7 +380,7 @@ static int xc_set_RF_frequency(struct xc5000_priv *priv, u32 freq_hz) ...@@ -380,7 +380,7 @@ static int xc_set_RF_frequency(struct xc5000_priv *priv, u32 freq_hz)
{ {
u16 freq_code; u16 freq_code;
dprintk(1, "%s(%u)\n", __FUNCTION__, freq_hz); dprintk(1, "%s(%u)\n", __func__, freq_hz);
if ((freq_hz > xc5000_tuner_ops.info.frequency_max) || if ((freq_hz > xc5000_tuner_ops.info.frequency_max) ||
(freq_hz < xc5000_tuner_ops.info.frequency_min)) (freq_hz < xc5000_tuner_ops.info.frequency_min))
...@@ -396,7 +396,7 @@ static int xc_set_IF_frequency(struct xc5000_priv *priv, u32 freq_khz) ...@@ -396,7 +396,7 @@ static int xc_set_IF_frequency(struct xc5000_priv *priv, u32 freq_khz)
{ {
u32 freq_code = (freq_khz * 1024)/1000; u32 freq_code = (freq_khz * 1024)/1000;
dprintk(1, "%s(freq_khz = %d) freq_code = 0x%x\n", dprintk(1, "%s(freq_khz = %d) freq_code = 0x%x\n",
__FUNCTION__, freq_khz, freq_code); __func__, freq_khz, freq_code);
return xc_write_reg(priv, XREG_IF_OUT, freq_code); return xc_write_reg(priv, XREG_IF_OUT, freq_code);
} }
...@@ -488,7 +488,7 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz) ...@@ -488,7 +488,7 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz)
{ {
int found = 0; int found = 0;
dprintk(1, "%s(%u)\n", __FUNCTION__, freq_hz); dprintk(1, "%s(%u)\n", __func__, freq_hz);
if (xc_set_RF_frequency(priv, freq_hz) != XC_RESULT_SUCCESS) if (xc_set_RF_frequency(priv, freq_hz) != XC_RESULT_SUCCESS)
return 0; return 0;
...@@ -627,12 +627,12 @@ static int xc5000_set_params(struct dvb_frontend *fe, ...@@ -627,12 +627,12 @@ static int xc5000_set_params(struct dvb_frontend *fe,
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
int ret; int ret;
dprintk(1, "%s() frequency=%d (Hz)\n", __FUNCTION__, params->frequency); dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency);
switch(params->u.vsb.modulation) { switch(params->u.vsb.modulation) {
case VSB_8: case VSB_8:
case VSB_16: case VSB_16:
dprintk(1, "%s() VSB modulation\n", __FUNCTION__); dprintk(1, "%s() VSB modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_AIR; priv->rf_mode = XC_RF_MODE_AIR;
priv->freq_hz = params->frequency - 1750000; priv->freq_hz = params->frequency - 1750000;
priv->bandwidth = BANDWIDTH_6_MHZ; priv->bandwidth = BANDWIDTH_6_MHZ;
...@@ -641,7 +641,7 @@ static int xc5000_set_params(struct dvb_frontend *fe, ...@@ -641,7 +641,7 @@ static int xc5000_set_params(struct dvb_frontend *fe,
case QAM_64: case QAM_64:
case QAM_256: case QAM_256:
case QAM_AUTO: case QAM_AUTO:
dprintk(1, "%s() QAM modulation\n", __FUNCTION__); dprintk(1, "%s() QAM modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_CABLE; priv->rf_mode = XC_RF_MODE_CABLE;
priv->freq_hz = params->frequency - 1750000; priv->freq_hz = params->frequency - 1750000;
priv->bandwidth = BANDWIDTH_6_MHZ; priv->bandwidth = BANDWIDTH_6_MHZ;
...@@ -652,7 +652,7 @@ static int xc5000_set_params(struct dvb_frontend *fe, ...@@ -652,7 +652,7 @@ static int xc5000_set_params(struct dvb_frontend *fe,
} }
dprintk(1, "%s() frequency=%d (compensated)\n", dprintk(1, "%s() frequency=%d (compensated)\n",
__FUNCTION__, priv->freq_hz); __func__, priv->freq_hz);
ret = xc_SetSignalSource(priv, priv->rf_mode); ret = xc_SetSignalSource(priv, priv->rf_mode);
if (ret != XC_RESULT_SUCCESS) { if (ret != XC_RESULT_SUCCESS) {
...@@ -697,7 +697,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe, ...@@ -697,7 +697,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,
xc_load_fw_and_init_tuner(fe); xc_load_fw_and_init_tuner(fe);
dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n", dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n",
__FUNCTION__, params->frequency); __func__, params->frequency);
priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */ priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */
...@@ -775,7 +775,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe, ...@@ -775,7 +775,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,
static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq)
{ {
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
*freq = priv->freq_hz; *freq = priv->freq_hz;
return 0; return 0;
} }
...@@ -783,7 +783,7 @@ static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) ...@@ -783,7 +783,7 @@ static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq)
static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw) static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw)
{ {
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
*bw = priv->bandwidth; *bw = priv->bandwidth;
return 0; return 0;
...@@ -796,7 +796,7 @@ static int xc5000_get_status(struct dvb_frontend *fe, u32 *status) ...@@ -796,7 +796,7 @@ static int xc5000_get_status(struct dvb_frontend *fe, u32 *status)
xc_get_lock_status(priv, &lock_status); xc_get_lock_status(priv, &lock_status);
dprintk(1, "%s() lock_status = 0x%08x\n", __FUNCTION__, lock_status); dprintk(1, "%s() lock_status = 0x%08x\n", __func__, lock_status);
*status = lock_status; *status = lock_status;
...@@ -836,7 +836,7 @@ static int xc5000_sleep(struct dvb_frontend *fe) ...@@ -836,7 +836,7 @@ static int xc5000_sleep(struct dvb_frontend *fe)
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
int ret; int ret;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
/* On Pinnacle PCTV HD 800i, the tuner cannot be reinitialized /* On Pinnacle PCTV HD 800i, the tuner cannot be reinitialized
* once shutdown without reloading the driver. Maybe I am not * once shutdown without reloading the driver. Maybe I am not
...@@ -848,7 +848,7 @@ static int xc5000_sleep(struct dvb_frontend *fe) ...@@ -848,7 +848,7 @@ static int xc5000_sleep(struct dvb_frontend *fe)
if(ret != XC_RESULT_SUCCESS) { if(ret != XC_RESULT_SUCCESS) {
printk(KERN_ERR printk(KERN_ERR
"xc5000: %s() unable to shutdown tuner\n", "xc5000: %s() unable to shutdown tuner\n",
__FUNCTION__); __func__);
return -EREMOTEIO; return -EREMOTEIO;
} }
else { else {
...@@ -860,7 +860,7 @@ static int xc5000_sleep(struct dvb_frontend *fe) ...@@ -860,7 +860,7 @@ static int xc5000_sleep(struct dvb_frontend *fe)
static int xc5000_init(struct dvb_frontend *fe) static int xc5000_init(struct dvb_frontend *fe)
{ {
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) { if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) {
printk(KERN_ERR "xc5000: Unable to initialise tuner\n"); printk(KERN_ERR "xc5000: Unable to initialise tuner\n");
...@@ -875,7 +875,7 @@ static int xc5000_init(struct dvb_frontend *fe) ...@@ -875,7 +875,7 @@ static int xc5000_init(struct dvb_frontend *fe)
static int xc5000_release(struct dvb_frontend *fe) static int xc5000_release(struct dvb_frontend *fe)
{ {
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
kfree(fe->tuner_priv); kfree(fe->tuner_priv);
fe->tuner_priv = NULL; fe->tuner_priv = NULL;
return 0; return 0;
...@@ -907,7 +907,7 @@ struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe, ...@@ -907,7 +907,7 @@ struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe,
struct xc5000_priv *priv = NULL; struct xc5000_priv *priv = NULL;
u16 id = 0; u16 id = 0;
dprintk(1, "%s()\n", __FUNCTION__); dprintk(1, "%s()\n", __func__);
priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL); priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
......
drivers/media/dvb/frontends/xc5000.h
View file @ 271ddbf7
...@@ -55,7 +55,7 @@ static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe, ...@@ -55,7 +55,7 @@ static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct i2c_adapter *i2c,
struct xc5000_config *cfg) struct xc5000_config *cfg)
{ {
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 // CONFIG_DVB_TUNER_XC5000 #endif // CONFIG_DVB_TUNER_XC5000
......
drivers/media/dvb/frontends/zl10353.c
View file @ 271ddbf7
...@@ -88,7 +88,7 @@ static int zl10353_read_register(struct zl10353_state *state, u8 reg) ...@@ -88,7 +88,7 @@ static int zl10353_read_register(struct zl10353_state *state, u8 reg)
if (ret != 2) { if (ret != 2) {
printk("%s: readreg error (reg=%d, ret==%i)\n", printk("%s: readreg error (reg=%d, ret==%i)\n",
__FUNCTION__, reg, ret); __func__, reg, ret);
return ret; return ret;
} }
...@@ -152,7 +152,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe, ...@@ -152,7 +152,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
*nominal_rate = value; *nominal_rate = value;
dprintk("%s: bw %d, adc_clock %d => 0x%x\n", dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
__FUNCTION__, bw, adc_clock, *nominal_rate); __func__, bw, adc_clock, *nominal_rate);
} }
static void zl10353_calc_input_freq(struct dvb_frontend *fe, static void zl10353_calc_input_freq(struct dvb_frontend *fe,
...@@ -181,7 +181,7 @@ static void zl10353_calc_input_freq(struct dvb_frontend *fe, ...@@ -181,7 +181,7 @@ static void zl10353_calc_input_freq(struct dvb_frontend *fe,
*input_freq = -value; *input_freq = -value;
dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n", dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n",
__FUNCTION__, if2, ife, adc_clock, -(int)value, *input_freq); __func__, if2, ife, adc_clock, -(int)value, *input_freq);
} }
static int zl10353_sleep(struct dvb_frontend *fe) static int zl10353_sleep(struct dvb_frontend *fe)
......
drivers/media/dvb/frontends/zl10353.h
View file @ 271ddbf7
...@@ -47,7 +47,7 @@ extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config, ...@@ -47,7 +47,7 @@ extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
static inline struct dvb_frontend* zl10353_attach(const struct zl10353_config *config, static inline struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
struct i2c_adapter *i2c) 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; return NULL;
} }
#endif /* CONFIG_DVB_ZL10353 */ #endif /* CONFIG_DVB_ZL10353 */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7