aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-08 22:20:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:58 -0400
commit271ddbf702c3a4e6b18f6464180eda0f62efd9a5 (patch)
tree37a384a4ce6216c694ee0d86ffc89d4aa56944e1 /drivers/media
parent708bebdd3922c6f346b8540f93c73f006d2b947b (diff)
V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/bcm3510.c4
-rw-r--r--drivers/media/dvb/frontends/bcm3510.h2
-rw-r--r--drivers/media/dvb/frontends/cx22700.c12
-rw-r--r--drivers/media/dvb/frontends/cx22700.h2
-rw-r--r--drivers/media/dvb/frontends/cx22702.c24
-rw-r--r--drivers/media/dvb/frontends/cx22702.h2
-rw-r--r--drivers/media/dvb/frontends/cx24110.c6
-rw-r--r--drivers/media/dvb/frontends/cx24110.h2
-rw-r--r--drivers/media/dvb/frontends/dib3000.h2
-rw-r--r--drivers/media/dvb/frontends/dib3000mc.h2
-rw-r--r--drivers/media/dvb/frontends/dvb-pll.h2
-rw-r--r--drivers/media/dvb/frontends/isl6405.h2
-rw-r--r--drivers/media/dvb/frontends/isl6421.h2
-rw-r--r--drivers/media/dvb/frontends/l64781.c2
-rw-r--r--drivers/media/dvb/frontends/l64781.h2
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.c38
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.h2
-rw-r--r--drivers/media/dvb/frontends/lnbp21.h2
-rw-r--r--drivers/media/dvb/frontends/mt2060.h2
-rw-r--r--drivers/media/dvb/frontends/mt2131.c14
-rw-r--r--drivers/media/dvb/frontends/mt2131.h2
-rw-r--r--drivers/media/dvb/frontends/mt2266.h2
-rw-r--r--drivers/media/dvb/frontends/mt312.c6
-rw-r--r--drivers/media/dvb/frontends/mt312.h2
-rw-r--r--drivers/media/dvb/frontends/mt352.c8
-rw-r--r--drivers/media/dvb/frontends/mt352.h2
-rw-r--r--drivers/media/dvb/frontends/nxt200x.c26
-rw-r--r--drivers/media/dvb/frontends/nxt200x.h2
-rw-r--r--drivers/media/dvb/frontends/nxt6000.h2
-rw-r--r--drivers/media/dvb/frontends/or51132.c6
-rw-r--r--drivers/media/dvb/frontends/or51132.h2
-rw-r--r--drivers/media/dvb/frontends/or51211.c6
-rw-r--r--drivers/media/dvb/frontends/or51211.h2
-rw-r--r--drivers/media/dvb/frontends/qt1010.h2
-rw-r--r--drivers/media/dvb/frontends/s5h1409.c48
-rw-r--r--drivers/media/dvb/frontends/s5h1409.h2
-rw-r--r--drivers/media/dvb/frontends/s5h1420.c2
-rw-r--r--drivers/media/dvb/frontends/s5h1420.h2
-rw-r--r--drivers/media/dvb/frontends/sp8870.c26
-rw-r--r--drivers/media/dvb/frontends/sp8870.h2
-rw-r--r--drivers/media/dvb/frontends/sp887x.c18
-rw-r--r--drivers/media/dvb/frontends/sp887x.h2
-rw-r--r--drivers/media/dvb/frontends/stv0297.c14
-rw-r--r--drivers/media/dvb/frontends/stv0297.h2
-rw-r--r--drivers/media/dvb/frontends/stv0299.c40
-rw-r--r--drivers/media/dvb/frontends/stv0299.h2
-rw-r--r--drivers/media/dvb/frontends/tda10021.c4
-rw-r--r--drivers/media/dvb/frontends/tda10023.c4
-rw-r--r--drivers/media/dvb/frontends/tda1002x.h4
-rw-r--r--drivers/media/dvb/frontends/tda1004x.c56
-rw-r--r--drivers/media/dvb/frontends/tda1004x.h4
-rw-r--r--drivers/media/dvb/frontends/tda10086.c40
-rw-r--r--drivers/media/dvb/frontends/tda10086.h2
-rw-r--r--drivers/media/dvb/frontends/tda18271-priv.h2
-rw-r--r--drivers/media/dvb/frontends/tda18271.h2
-rw-r--r--drivers/media/dvb/frontends/tda8083.c4
-rw-r--r--drivers/media/dvb/frontends/tda8083.h2
-rw-r--r--drivers/media/dvb/frontends/tda826x.c10
-rw-r--r--drivers/media/dvb/frontends/tda826x.h2
-rw-r--r--drivers/media/dvb/frontends/tda827x.h2
-rw-r--r--drivers/media/dvb/frontends/tua6100.c2
-rw-r--r--drivers/media/dvb/frontends/tua6100.h2
-rw-r--r--drivers/media/dvb/frontends/ves1820.c4
-rw-r--r--drivers/media/dvb/frontends/ves1820.h2
-rw-r--r--drivers/media/dvb/frontends/ves1x93.c6
-rw-r--r--drivers/media/dvb/frontends/ves1x93.h2
-rw-r--r--drivers/media/dvb/frontends/xc5000.c44
-rw-r--r--drivers/media/dvb/frontends/xc5000.h2
-rw-r--r--drivers/media/dvb/frontends/zl10353.c6
-rw-r--r--drivers/media/dvb/frontends/zl10353.h2
70 files changed, 283 insertions, 283 deletions
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index a913f49c062b..d268e65e777d 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -91,7 +91,7 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8
91 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 91 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
92 92
93 deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n", 93 deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n",
94 __FUNCTION__, state->config->demod_address, reg, err); 94 __func__, state->config->demod_address, reg, err);
95 return -EREMOTEIO; 95 return -EREMOTEIO;
96 } 96 }
97 97
@@ -110,7 +110,7 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l
110 110
111 if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) { 111 if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
112 deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n", 112 deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n",
113 __FUNCTION__, state->config->demod_address, reg, err); 113 __func__, state->config->demod_address, reg, err);
114 return -EREMOTEIO; 114 return -EREMOTEIO;
115 } 115 }
116 deb_i2c("i2c rd %02x: ",reg); 116 deb_i2c("i2c rd %02x: ",reg);
diff --git a/drivers/media/dvb/frontends/bcm3510.h b/drivers/media/dvb/frontends/bcm3510.h
index 7e4f95e1734b..f4575c0cc446 100644
--- a/drivers/media/dvb/frontends/bcm3510.h
+++ b/drivers/media/dvb/frontends/bcm3510.h
@@ -41,7 +41,7 @@ extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,
41static inline struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config, 41static inline struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,
42 struct i2c_adapter* i2c) 42 struct i2c_adapter* i2c)
43{ 43{
44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
45 return NULL; 45 return NULL;
46} 46}
47#endif // CONFIG_DVB_BCM3510 47#endif // CONFIG_DVB_BCM3510
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 11a4968f18cb..ace5cb17165d 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -73,13 +73,13 @@ static int cx22700_writereg (struct cx22700_state* state, u8 reg, u8 data)
73 u8 buf [] = { reg, data }; 73 u8 buf [] = { reg, data };
74 struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; 74 struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
75 75
76 dprintk ("%s\n", __FUNCTION__); 76 dprintk ("%s\n", __func__);
77 77
78 ret = i2c_transfer (state->i2c, &msg, 1); 78 ret = i2c_transfer (state->i2c, &msg, 1);
79 79
80 if (ret != 1) 80 if (ret != 1)
81 printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", 81 printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
82 __FUNCTION__, reg, data, ret); 82 __func__, reg, data, ret);
83 83
84 return (ret != 1) ? -1 : 0; 84 return (ret != 1) ? -1 : 0;
85} 85}
@@ -92,7 +92,7 @@ static int cx22700_readreg (struct cx22700_state* state, u8 reg)
92 struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 }, 92 struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
93 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } }; 93 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
94 94
95 dprintk ("%s\n", __FUNCTION__); 95 dprintk ("%s\n", __func__);
96 96
97 ret = i2c_transfer (state->i2c, msg, 2); 97 ret = i2c_transfer (state->i2c, msg, 2);
98 98
@@ -105,7 +105,7 @@ static int cx22700_set_inversion (struct cx22700_state* state, int inversion)
105{ 105{
106 u8 val; 106 u8 val;
107 107
108 dprintk ("%s\n", __FUNCTION__); 108 dprintk ("%s\n", __func__);
109 109
110 switch (inversion) { 110 switch (inversion) {
111 case INVERSION_AUTO: 111 case INVERSION_AUTO:
@@ -127,7 +127,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
127 static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 }; 127 static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 };
128 u8 val; 128 u8 val;
129 129
130 dprintk ("%s\n", __FUNCTION__); 130 dprintk ("%s\n", __func__);
131 131
132 if (p->code_rate_HP < FEC_1_2 || p->code_rate_HP > FEC_7_8) 132 if (p->code_rate_HP < FEC_1_2 || p->code_rate_HP > FEC_7_8)
133 return -EINVAL; 133 return -EINVAL;
@@ -191,7 +191,7 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet
191 FEC_5_6, FEC_7_8 }; 191 FEC_5_6, FEC_7_8 };
192 u8 val; 192 u8 val;
193 193
194 dprintk ("%s\n", __FUNCTION__); 194 dprintk ("%s\n", __func__);
195 195
196 if (!(cx22700_readreg(state, 0x07) & 0x20)) /* tps valid? */ 196 if (!(cx22700_readreg(state, 0x07) & 0x20)) /* tps valid? */
197 return -EAGAIN; 197 return -EAGAIN;
diff --git a/drivers/media/dvb/frontends/cx22700.h b/drivers/media/dvb/frontends/cx22700.h
index 7ac33690cdcc..4757a930ca05 100644
--- a/drivers/media/dvb/frontends/cx22700.h
+++ b/drivers/media/dvb/frontends/cx22700.h
@@ -38,7 +38,7 @@ extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
38static inline struct dvb_frontend* cx22700_attach(const struct cx22700_config* config, 38static inline struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
39 struct i2c_adapter* i2c) 39 struct i2c_adapter* i2c)
40{ 40{
41 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 41 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
42 return NULL; 42 return NULL;
43} 43}
44#endif // CONFIG_DVB_CX22700 44#endif // CONFIG_DVB_CX22700
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 406c4cfa82bb..cc1db4e371c3 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -90,7 +90,7 @@ static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data)
90 90
91 if (ret != 1) 91 if (ret != 1)
92 printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", 92 printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
93 __FUNCTION__, reg, data, ret); 93 __func__, reg, data, ret);
94 94
95 return (ret != 1) ? -1 : 0; 95 return (ret != 1) ? -1 : 0;
96} 96}
@@ -108,7 +108,7 @@ static u8 cx22702_readreg (struct cx22702_state* state, u8 reg)
108 ret = i2c_transfer(state->i2c, msg, 2); 108 ret = i2c_transfer(state->i2c, msg, 2);
109 109
110 if (ret != 2) 110 if (ret != 2)
111 printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); 111 printk("%s: readreg error (ret == %i)\n", __func__, ret);
112 112
113 return b1[0]; 113 return b1[0];
114} 114}
@@ -195,7 +195,7 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet
195static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) 195static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
196{ 196{
197 struct cx22702_state* state = fe->demodulator_priv; 197 struct cx22702_state* state = fe->demodulator_priv;
198 dprintk ("%s(%d)\n", __FUNCTION__, enable); 198 dprintk ("%s(%d)\n", __func__, enable);
199 if (enable) 199 if (enable)
200 return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe); 200 return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe);
201 else 201 else
@@ -228,7 +228,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
228 cx22702_writereg(state, 0x0C, cx22702_readreg(state, 0x0C) &0xcf ); 228 cx22702_writereg(state, 0x0C, cx22702_readreg(state, 0x0C) &0xcf );
229 break; 229 break;
230 default: 230 default:
231 dprintk ("%s: invalid bandwidth\n",__FUNCTION__); 231 dprintk ("%s: invalid bandwidth\n",__func__);
232 return -EINVAL; 232 return -EINVAL;
233 } 233 }
234 234
@@ -250,7 +250,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
250 cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc ); 250 cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc );
251 cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 ); 251 cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );
252 cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */ 252 cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */
253 dprintk("%s: Autodetecting\n",__FUNCTION__); 253 dprintk("%s: Autodetecting\n",__func__);
254 return 0; 254 return 0;
255 } 255 }
256 256
@@ -261,7 +261,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
261 case QAM_16: val = (val&0xe7)|0x08; break; 261 case QAM_16: val = (val&0xe7)|0x08; break;
262 case QAM_64: val = (val&0xe7)|0x10; break; 262 case QAM_64: val = (val&0xe7)|0x10; break;
263 default: 263 default:
264 dprintk ("%s: invalid constellation\n",__FUNCTION__); 264 dprintk ("%s: invalid constellation\n",__func__);
265 return -EINVAL; 265 return -EINVAL;
266 } 266 }
267 switch(p->u.ofdm.hierarchy_information) { 267 switch(p->u.ofdm.hierarchy_information) {
@@ -270,7 +270,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
270 case HIERARCHY_2: val = (val&0xf8)|2; break; 270 case HIERARCHY_2: val = (val&0xf8)|2; break;
271 case HIERARCHY_4: val = (val&0xf8)|3; break; 271 case HIERARCHY_4: val = (val&0xf8)|3; break;
272 default: 272 default:
273 dprintk ("%s: invalid hierarchy\n",__FUNCTION__); 273 dprintk ("%s: invalid hierarchy\n",__func__);
274 return -EINVAL; 274 return -EINVAL;
275 } 275 }
276 cx22702_writereg (state, 0x06, val); 276 cx22702_writereg (state, 0x06, val);
@@ -284,7 +284,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
284 case FEC_5_6: val = (val&0xc7)|0x18; break; 284 case FEC_5_6: val = (val&0xc7)|0x18; break;
285 case FEC_7_8: val = (val&0xc7)|0x20; break; 285 case FEC_7_8: val = (val&0xc7)|0x20; break;
286 default: 286 default:
287 dprintk ("%s: invalid code_rate_HP\n",__FUNCTION__); 287 dprintk ("%s: invalid code_rate_HP\n",__func__);
288 return -EINVAL; 288 return -EINVAL;
289 } 289 }
290 switch(p->u.ofdm.code_rate_LP) { 290 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 case FEC_5_6: val = (val&0xf8)|3; break; 295 case FEC_5_6: val = (val&0xf8)|3; break;
296 case FEC_7_8: val = (val&0xf8)|4; break; 296 case FEC_7_8: val = (val&0xf8)|4; break;
297 default: 297 default:
298 dprintk ("%s: invalid code_rate_LP\n",__FUNCTION__); 298 dprintk ("%s: invalid code_rate_LP\n",__func__);
299 return -EINVAL; 299 return -EINVAL;
300 } 300 }
301 cx22702_writereg (state, 0x07, val); 301 cx22702_writereg (state, 0x07, val);
@@ -307,14 +307,14 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
307 case GUARD_INTERVAL_1_8: val = (val&0xf3)|0x08; break; 307 case GUARD_INTERVAL_1_8: val = (val&0xf3)|0x08; break;
308 case GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break; 308 case GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break;
309 default: 309 default:
310 dprintk ("%s: invalid guard_interval\n",__FUNCTION__); 310 dprintk ("%s: invalid guard_interval\n",__func__);
311 return -EINVAL; 311 return -EINVAL;
312 } 312 }
313 switch(p->u.ofdm.transmission_mode) { 313 switch(p->u.ofdm.transmission_mode) {
314 case TRANSMISSION_MODE_2K: val = (val&0xfc); break; 314 case TRANSMISSION_MODE_2K: val = (val&0xfc); break;
315 case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break; 315 case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break;
316 default: 316 default:
317 dprintk ("%s: invalid transmission_mode\n",__FUNCTION__); 317 dprintk ("%s: invalid transmission_mode\n",__func__);
318 return -EINVAL; 318 return -EINVAL;
319 } 319 }
320 cx22702_writereg(state, 0x08, val); 320 cx22702_writereg(state, 0x08, val);
@@ -360,7 +360,7 @@ static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)
360 reg23 = cx22702_readreg (state, 0x23); 360 reg23 = cx22702_readreg (state, 0x23);
361 361
362 dprintk ("%s: status demod=0x%02x agc=0x%02x\n" 362 dprintk ("%s: status demod=0x%02x agc=0x%02x\n"
363 ,__FUNCTION__,reg0A,reg23); 363 ,__func__,reg0A,reg23);
364 364
365 if(reg0A & 0x10) { 365 if(reg0A & 0x10) {
366 *status |= FE_HAS_LOCK; 366 *status |= FE_HAS_LOCK;
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h
index 9cd64da6ee40..8af766a31552 100644
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
@@ -48,7 +48,7 @@ extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
48static inline struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, 48static inline struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
49 struct i2c_adapter* i2c) 49 struct i2c_adapter* i2c)
50{ 50{
51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
52 return NULL; 52 return NULL;
53} 53}
54#endif // CONFIG_DVB_CX22702 54#endif // CONFIG_DVB_CX22702
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index b03d8283c37d..87ae29db024f 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -121,7 +121,7 @@ static int cx24110_writereg (struct cx24110_state* state, int reg, int data)
121 121
122 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { 122 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
123 dprintk ("%s: writereg error (err == %i, reg == 0x%02x," 123 dprintk ("%s: writereg error (err == %i, reg == 0x%02x,"
124 " data == 0x%02x)\n", __FUNCTION__, err, reg, data); 124 " data == 0x%02x)\n", __func__, err, reg, data);
125 return -EREMOTEIO; 125 return -EREMOTEIO;
126 } 126 }
127 127
@@ -247,7 +247,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
247 static const u32 bands[]={5000000UL,15000000UL,90999000UL/2}; 247 static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
248 int i; 248 int i;
249 249
250 dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate); 250 dprintk("cx24110 debug: entering %s(%d)\n",__func__,srate);
251 if (srate>90999000UL/2) 251 if (srate>90999000UL/2)
252 srate=90999000UL/2; 252 srate=90999000UL/2;
253 if (srate<500000) 253 if (srate<500000)
@@ -358,7 +358,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
358/* fixme (low): error handling */ 358/* fixme (low): error handling */
359 int i; 359 int i;
360 360
361 dprintk("%s: init chip\n", __FUNCTION__); 361 dprintk("%s: init chip\n", __func__);
362 362
363 for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) { 363 for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {
364 cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data); 364 cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h
index 0ca3af4db513..1792adb23c4d 100644
--- a/drivers/media/dvb/frontends/cx24110.h
+++ b/drivers/media/dvb/frontends/cx24110.h
@@ -48,7 +48,7 @@ extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
48static inline struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, 48static inline struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
49 struct i2c_adapter* i2c) 49 struct i2c_adapter* i2c)
50{ 50{
51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
52 return NULL; 52 return NULL;
53} 53}
54#endif // CONFIG_DVB_CX24110 54#endif // CONFIG_DVB_CX24110
diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
index a6d3854a67bc..ba917359fa65 100644
--- a/drivers/media/dvb/frontends/dib3000.h
+++ b/drivers/media/dvb/frontends/dib3000.h
@@ -48,7 +48,7 @@ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config
48static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config, 48static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
49 struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops) 49 struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
50{ 50{
51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
52 return NULL; 52 return NULL;
53} 53}
54#endif // CONFIG_DVB_DIB3000MB 54#endif // CONFIG_DVB_DIB3000MB
diff --git a/drivers/media/dvb/frontends/dib3000mc.h b/drivers/media/dvb/frontends/dib3000mc.h
index 72d4757601d8..4142ed7a47d0 100644
--- a/drivers/media/dvb/frontends/dib3000mc.h
+++ b/drivers/media/dvb/frontends/dib3000mc.h
@@ -44,7 +44,7 @@ extern struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i
44#else 44#else
45static inline struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib3000mc_config *cfg) 45static inline struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib3000mc_config *cfg)
46{ 46{
47 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 47 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
48 return NULL; 48 return NULL;
49} 49}
50#endif // CONFIG_DVB_DIB3000MC 50#endif // CONFIG_DVB_DIB3000MC
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index 435146d9fa12..872ca29e7cf3 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -43,7 +43,7 @@ static inline struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe,
43 struct i2c_adapter *i2c, 43 struct i2c_adapter *i2c,
44 unsigned int pll_desc_id) 44 unsigned int pll_desc_id)
45{ 45{
46 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 46 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
47 return NULL; 47 return NULL;
48} 48}
49#endif 49#endif
diff --git a/drivers/media/dvb/frontends/isl6405.h b/drivers/media/dvb/frontends/isl6405.h
index 9d4001a2237e..1c793d37576b 100644
--- a/drivers/media/dvb/frontends/isl6405.h
+++ b/drivers/media/dvb/frontends/isl6405.h
@@ -66,7 +66,7 @@ static inline struct dvb_frontend *isl6405_attach(struct dvb_frontend *fe,
66 struct i2c_adapter *i2c, u8 i2c_addr, 66 struct i2c_adapter *i2c, u8 i2c_addr,
67 u8 override_set, u8 override_clear) 67 u8 override_set, u8 override_clear)
68{ 68{
69 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 69 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
70 return NULL; 70 return NULL;
71} 71}
72#endif /* CONFIG_DVB_ISL6405 */ 72#endif /* CONFIG_DVB_ISL6405 */
diff --git a/drivers/media/dvb/frontends/isl6421.h b/drivers/media/dvb/frontends/isl6421.h
index ea7f78a7d3cd..47e4518a042d 100644
--- a/drivers/media/dvb/frontends/isl6421.h
+++ b/drivers/media/dvb/frontends/isl6421.h
@@ -47,7 +47,7 @@ extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_a
47static inline struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr, 47static inline struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,
48 u8 override_set, u8 override_clear) 48 u8 override_set, u8 override_clear)
49{ 49{
50 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 50 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
51 return NULL; 51 return NULL;
52} 52}
53#endif // CONFIG_DVB_ISL6421 53#endif // CONFIG_DVB_ISL6421
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index 443d9045d4c9..e1e70e9e0cb9 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -57,7 +57,7 @@ static int l64781_writereg (struct l64781_state* state, u8 reg, u8 data)
57 57
58 if ((ret = i2c_transfer(state->i2c, &msg, 1)) != 1) 58 if ((ret = i2c_transfer(state->i2c, &msg, 1)) != 1)
59 dprintk ("%s: write_reg error (reg == %02x) = %02x!\n", 59 dprintk ("%s: write_reg error (reg == %02x) = %02x!\n",
60 __FUNCTION__, reg, ret); 60 __func__, reg, ret);
61 61
62 return (ret != 1) ? -1 : 0; 62 return (ret != 1) ? -1 : 0;
63} 63}
diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb/frontends/l64781.h
index cd15f76ff28d..1305a9e7fb0b 100644
--- a/drivers/media/dvb/frontends/l64781.h
+++ b/drivers/media/dvb/frontends/l64781.h
@@ -38,7 +38,7 @@ extern struct dvb_frontend* l64781_attach(const struct l64781_config* config,
38static inline struct dvb_frontend* l64781_attach(const struct l64781_config* config, 38static inline struct dvb_frontend* l64781_attach(const struct l64781_config* config,
39 struct i2c_adapter* i2c) 39 struct i2c_adapter* i2c)
40{ 40{
41 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 41 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
42 return NULL; 42 return NULL;
43} 43}
44#endif // CONFIG_DVB_L64781 44#endif // CONFIG_DVB_L64781
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index dc897a3903fc..f0195c8272f4 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -88,7 +88,7 @@ static int i2c_write_demod_bytes (struct lgdt330x_state* state,
88 88
89 for (i=0; i<len-1; i+=2){ 89 for (i=0; i<len-1; i+=2){
90 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { 90 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
91 printk(KERN_WARNING "lgdt330x: %s error (addr %02x <- %02x, err = %i)\n", __FUNCTION__, msg.buf[0], msg.buf[1], err); 91 printk(KERN_WARNING "lgdt330x: %s error (addr %02x <- %02x, err = %i)\n", __func__, msg.buf[0], msg.buf[1], err);
92 if (err < 0) 92 if (err < 0)
93 return err; 93 return err;
94 else 94 else
@@ -117,7 +117,7 @@ static u8 i2c_read_demod_bytes (struct lgdt330x_state* state,
117 int ret; 117 int ret;
118 ret = i2c_transfer(state->i2c, msg, 2); 118 ret = i2c_transfer(state->i2c, msg, 2);
119 if (ret != 2) { 119 if (ret != 2) {
120 printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __FUNCTION__, state->config->demod_address, reg, ret); 120 printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __func__, state->config->demod_address, reg, ret);
121 } else { 121 } else {
122 ret = 0; 122 ret = 0;
123 } 123 }
@@ -256,7 +256,7 @@ static int lgdt330x_init(struct dvb_frontend* fe)
256 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n"); 256 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n");
257 err = -ENODEV; 257 err = -ENODEV;
258 } 258 }
259 dprintk("%s entered as %s\n", __FUNCTION__, chip_name); 259 dprintk("%s entered as %s\n", __func__, chip_name);
260 if (err < 0) 260 if (err < 0)
261 return err; 261 return err;
262 return lgdt330x_SwReset(state); 262 return lgdt330x_SwReset(state);
@@ -334,7 +334,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
334 if (state->current_modulation != param->u.vsb.modulation) { 334 if (state->current_modulation != param->u.vsb.modulation) {
335 switch(param->u.vsb.modulation) { 335 switch(param->u.vsb.modulation) {
336 case VSB_8: 336 case VSB_8:
337 dprintk("%s: VSB_8 MODE\n", __FUNCTION__); 337 dprintk("%s: VSB_8 MODE\n", __func__);
338 338
339 /* Select VSB mode */ 339 /* Select VSB mode */
340 top_ctrl_cfg[1] = 0x03; 340 top_ctrl_cfg[1] = 0x03;
@@ -350,7 +350,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
350 break; 350 break;
351 351
352 case QAM_64: 352 case QAM_64:
353 dprintk("%s: QAM_64 MODE\n", __FUNCTION__); 353 dprintk("%s: QAM_64 MODE\n", __func__);
354 354
355 /* Select QAM_64 mode */ 355 /* Select QAM_64 mode */
356 top_ctrl_cfg[1] = 0x00; 356 top_ctrl_cfg[1] = 0x00;
@@ -366,7 +366,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
366 break; 366 break;
367 367
368 case QAM_256: 368 case QAM_256:
369 dprintk("%s: QAM_256 MODE\n", __FUNCTION__); 369 dprintk("%s: QAM_256 MODE\n", __func__);
370 370
371 /* Select QAM_256 mode */ 371 /* Select QAM_256 mode */
372 top_ctrl_cfg[1] = 0x01; 372 top_ctrl_cfg[1] = 0x01;
@@ -381,7 +381,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
381 } 381 }
382 break; 382 break;
383 default: 383 default:
384 printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __FUNCTION__, param->u.vsb.modulation); 384 printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __func__, param->u.vsb.modulation);
385 return -1; 385 return -1;
386 } 386 }
387 /* 387 /*
@@ -431,7 +431,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
431 431
432 /* AGC status register */ 432 /* AGC status register */
433 i2c_read_demod_bytes(state, AGC_STATUS, buf, 1); 433 i2c_read_demod_bytes(state, AGC_STATUS, buf, 1);
434 dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]); 434 dprintk("%s: AGC_STATUS = 0x%02x\n", __func__, buf[0]);
435 if ((buf[0] & 0x0c) == 0x8){ 435 if ((buf[0] & 0x0c) == 0x8){
436 /* Test signal does not exist flag */ 436 /* Test signal does not exist flag */
437 /* as well as the AGC lock flag. */ 437 /* 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 */ 445 */
446 /* signal status */ 446 /* signal status */
447 i2c_read_demod_bytes(state, TOP_CONTROL, buf, sizeof(buf)); 447 i2c_read_demod_bytes(state, TOP_CONTROL, buf, sizeof(buf));
448 dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __FUNCTION__, buf[0], buf[1], buf[2]); 448 dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __func__, buf[0], buf[1], buf[2]);
449 449
450 450
451 /* sync status */ 451 /* sync status */
@@ -461,7 +461,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
461 461
462 /* Carrier Recovery Lock Status Register */ 462 /* Carrier Recovery Lock Status Register */
463 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); 463 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
464 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]); 464 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __func__, buf[0]);
465 switch (state->current_modulation) { 465 switch (state->current_modulation) {
466 case QAM_256: 466 case QAM_256:
467 case QAM_64: 467 case QAM_64:
@@ -474,7 +474,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
474 *status |= FE_HAS_CARRIER; 474 *status |= FE_HAS_CARRIER;
475 break; 475 break;
476 default: 476 default:
477 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __FUNCTION__); 477 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __func__);
478 } 478 }
479 479
480 return 0; 480 return 0;
@@ -493,7 +493,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
493 if (err < 0) 493 if (err < 0)
494 return err; 494 return err;
495 495
496 dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]); 496 dprintk("%s: AGC_STATUS = 0x%02x\n", __func__, buf[0]);
497 if ((buf[0] & 0x21) == 0x01){ 497 if ((buf[0] & 0x21) == 0x01){
498 /* Test input signal does not exist flag */ 498 /* Test input signal does not exist flag */
499 /* as well as the AGC lock flag. */ 499 /* 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 502
503 /* Carrier Recovery Lock Status Register */ 503 /* Carrier Recovery Lock Status Register */
504 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); 504 i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
505 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]); 505 dprintk("%s: CARRIER_LOCK = 0x%02x\n", __func__, buf[0]);
506 switch (state->current_modulation) { 506 switch (state->current_modulation) {
507 case QAM_256: 507 case QAM_256:
508 case QAM_64: 508 case QAM_64:
@@ -533,7 +533,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
533 } 533 }
534 break; 534 break;
535 default: 535 default:
536 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __FUNCTION__); 536 printk(KERN_WARNING "lgdt330x: %s: Modulation set to unsupported value\n", __func__);
537 } 537 }
538 return 0; 538 return 0;
539} 539}
@@ -607,14 +607,14 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
607 break; 607 break;
608 default: 608 default:
609 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n", 609 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n",
610 __FUNCTION__); 610 __func__);
611 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */ 611 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */
612 } 612 }
613 613
614 state->snr = calculate_snr(noise, c); 614 state->snr = calculate_snr(noise, c);
615 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */ 615 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */
616 616
617 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, 617 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
618 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); 618 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
619 619
620 return 0; 620 return 0;
@@ -651,14 +651,14 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr)
651 break; 651 break;
652 default: 652 default:
653 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n", 653 printk(KERN_ERR "lgdt330x: %s: Modulation set to unsupported value\n",
654 __FUNCTION__); 654 __func__);
655 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */ 655 return -EREMOTEIO; /* return -EDRIVER_IS_GIBBERED; */
656 } 656 }
657 657
658 state->snr = calculate_snr(noise, c); 658 state->snr = calculate_snr(noise, c);
659 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */ 659 *snr = (state->snr) >> 16; /* Convert from 8.24 fixed-point to 8.8 */
660 660
661 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, 661 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
662 state->snr >> 24, (((state->snr >> 8) & 0xffff) * 100) >> 16); 662 state->snr >> 24, (((state->snr >> 8) & 0xffff) * 100) >> 16);
663 663
664 return 0; 664 return 0;
@@ -743,7 +743,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
743 743
744error: 744error:
745 kfree(state); 745 kfree(state);
746 dprintk("%s: ERROR\n",__FUNCTION__); 746 dprintk("%s: ERROR\n",__func__);
747 return NULL; 747 return NULL;
748} 748}
749 749
diff --git a/drivers/media/dvb/frontends/lgdt330x.h b/drivers/media/dvb/frontends/lgdt330x.h
index 995059004b10..9012504f0f2d 100644
--- a/drivers/media/dvb/frontends/lgdt330x.h
+++ b/drivers/media/dvb/frontends/lgdt330x.h
@@ -59,7 +59,7 @@ extern struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config
59static inline struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config, 59static inline struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
60 struct i2c_adapter* i2c) 60 struct i2c_adapter* i2c)
61{ 61{
62 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 62 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
63 return NULL; 63 return NULL;
64} 64}
65#endif // CONFIG_DVB_LGDT330X 65#endif // CONFIG_DVB_LGDT330X
diff --git a/drivers/media/dvb/frontends/lnbp21.h b/drivers/media/dvb/frontends/lnbp21.h
index 68906acf7d63..8fe094bd9689 100644
--- a/drivers/media/dvb/frontends/lnbp21.h
+++ b/drivers/media/dvb/frontends/lnbp21.h
@@ -45,7 +45,7 @@ extern struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_ad
45#else 45#else
46static inline struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear) 46static inline struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)
47{ 47{
48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
49 return NULL; 49 return NULL;
50} 50}
51#endif // CONFIG_DVB_LNBP21 51#endif // CONFIG_DVB_LNBP21
diff --git a/drivers/media/dvb/frontends/mt2060.h b/drivers/media/dvb/frontends/mt2060.h
index 0a86eab3a954..acba0058f519 100644
--- a/drivers/media/dvb/frontends/mt2060.h
+++ b/drivers/media/dvb/frontends/mt2060.h
@@ -35,7 +35,7 @@ extern struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_a
35#else 35#else
36static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1) 36static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1)
37{ 37{
38 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 38 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
39 return NULL; 39 return NULL;
40} 40}
41#endif // CONFIG_DVB_TUNER_MT2060 41#endif // CONFIG_DVB_TUNER_MT2060
diff --git a/drivers/media/dvb/frontends/mt2131.c b/drivers/media/dvb/frontends/mt2131.c
index 13cf16668171..e254bcfc2efb 100644
--- a/drivers/media/dvb/frontends/mt2131.c
+++ b/drivers/media/dvb/frontends/mt2131.c
@@ -110,7 +110,7 @@ static int mt2131_set_params(struct dvb_frontend *fe,
110 priv->bandwidth = 0; 110 priv->bandwidth = 0;
111 111
112 freq = params->frequency / 1000; // Hz -> kHz 112 freq = params->frequency / 1000; // Hz -> kHz
113 dprintk(1, "%s() freq=%d\n", __FUNCTION__, freq); 113 dprintk(1, "%s() freq=%d\n", __func__, freq);
114 114
115 f_lo1 = freq + MT2131_IF1 * 1000; 115 f_lo1 = freq + MT2131_IF1 * 1000;
116 f_lo1 = (f_lo1 / 250) * 250; 116 f_lo1 = (f_lo1 / 250) * 250;
@@ -187,7 +187,7 @@ static int mt2131_set_params(struct dvb_frontend *fe,
187static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency) 187static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency)
188{ 188{
189 struct mt2131_priv *priv = fe->tuner_priv; 189 struct mt2131_priv *priv = fe->tuner_priv;
190 dprintk(1, "%s()\n", __FUNCTION__); 190 dprintk(1, "%s()\n", __func__);
191 *frequency = priv->frequency; 191 *frequency = priv->frequency;
192 return 0; 192 return 0;
193} 193}
@@ -195,7 +195,7 @@ static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency)
195static int mt2131_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth) 195static int mt2131_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
196{ 196{
197 struct mt2131_priv *priv = fe->tuner_priv; 197 struct mt2131_priv *priv = fe->tuner_priv;
198 dprintk(1, "%s()\n", __FUNCTION__); 198 dprintk(1, "%s()\n", __func__);
199 *bandwidth = priv->bandwidth; 199 *bandwidth = priv->bandwidth;
200 return 0; 200 return 0;
201} 201}
@@ -214,7 +214,7 @@ static int mt2131_get_status(struct dvb_frontend *fe, u32 *status)
214 214
215 mt2131_readreg(priv, 0x09, &afc_status); 215 mt2131_readreg(priv, 0x09, &afc_status);
216 dprintk(1, "%s() - LO Status = 0x%x, AFC Status = 0x%x\n", 216 dprintk(1, "%s() - LO Status = 0x%x, AFC Status = 0x%x\n",
217 __FUNCTION__, lock_status, afc_status); 217 __func__, lock_status, afc_status);
218 218
219 return 0; 219 return 0;
220} 220}
@@ -223,7 +223,7 @@ static int mt2131_init(struct dvb_frontend *fe)
223{ 223{
224 struct mt2131_priv *priv = fe->tuner_priv; 224 struct mt2131_priv *priv = fe->tuner_priv;
225 int ret; 225 int ret;
226 dprintk(1, "%s()\n", __FUNCTION__); 226 dprintk(1, "%s()\n", __func__);
227 227
228 if ((ret = mt2131_writeregs(priv, mt2131_config1, 228 if ((ret = mt2131_writeregs(priv, mt2131_config1,
229 sizeof(mt2131_config1))) < 0) 229 sizeof(mt2131_config1))) < 0)
@@ -243,7 +243,7 @@ static int mt2131_init(struct dvb_frontend *fe)
243 243
244static int mt2131_release(struct dvb_frontend *fe) 244static int mt2131_release(struct dvb_frontend *fe)
245{ 245{
246 dprintk(1, "%s()\n", __FUNCTION__); 246 dprintk(1, "%s()\n", __func__);
247 kfree(fe->tuner_priv); 247 kfree(fe->tuner_priv);
248 fe->tuner_priv = NULL; 248 fe->tuner_priv = NULL;
249 return 0; 249 return 0;
@@ -273,7 +273,7 @@ struct dvb_frontend * mt2131_attach(struct dvb_frontend *fe,
273 struct mt2131_priv *priv = NULL; 273 struct mt2131_priv *priv = NULL;
274 u8 id = 0; 274 u8 id = 0;
275 275
276 dprintk(1, "%s()\n", __FUNCTION__); 276 dprintk(1, "%s()\n", __func__);
277 277
278 priv = kzalloc(sizeof(struct mt2131_priv), GFP_KERNEL); 278 priv = kzalloc(sizeof(struct mt2131_priv), GFP_KERNEL);
279 if (priv == NULL) 279 if (priv == NULL)
diff --git a/drivers/media/dvb/frontends/mt2131.h b/drivers/media/dvb/frontends/mt2131.h
index 1e4ffe7dc8c8..606d8576bc98 100644
--- a/drivers/media/dvb/frontends/mt2131.h
+++ b/drivers/media/dvb/frontends/mt2131.h
@@ -41,7 +41,7 @@ static inline struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe,
41 struct mt2131_config *cfg, 41 struct mt2131_config *cfg,
42 u16 if1) 42 u16 if1)
43{ 43{
44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
45 return NULL; 45 return NULL;
46} 46}
47#endif /* CONFIG_DVB_TUNER_MT2131 */ 47#endif /* CONFIG_DVB_TUNER_MT2131 */
diff --git a/drivers/media/dvb/frontends/mt2266.h b/drivers/media/dvb/frontends/mt2266.h
index f31dd613ad37..c5113efe333c 100644
--- a/drivers/media/dvb/frontends/mt2266.h
+++ b/drivers/media/dvb/frontends/mt2266.h
@@ -29,7 +29,7 @@ extern struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_a
29#else 29#else
30static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg) 30static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg)
31{ 31{
32 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 32 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
33 return NULL; 33 return NULL;
34} 34}
35#endif // CONFIG_DVB_TUNER_MT2266 35#endif // CONFIG_DVB_TUNER_MT2266
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 1638301fbd6e..daca855c804a 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -76,7 +76,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg,
76 ret = i2c_transfer(state->i2c, msg, 2); 76 ret = i2c_transfer(state->i2c, msg, 2);
77 77
78 if (ret != 2) { 78 if (ret != 2) {
79 printk(KERN_ERR "%s: ret == %d\n", __FUNCTION__, ret); 79 printk(KERN_ERR "%s: ret == %d\n", __func__, ret);
80 return -EREMOTEIO; 80 return -EREMOTEIO;
81 } 81 }
82 82
@@ -117,7 +117,7 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg,
117 ret = i2c_transfer(state->i2c, &msg, 1); 117 ret = i2c_transfer(state->i2c, &msg, 1);
118 118
119 if (ret != 1) { 119 if (ret != 1) {
120 dprintk("%s: ret == %d\n", __FUNCTION__, ret); 120 dprintk("%s: ret == %d\n", __func__, ret);
121 return -EREMOTEIO; 121 return -EREMOTEIO;
122 } 122 }
123 123
@@ -499,7 +499,7 @@ static int mt312_set_frontend(struct dvb_frontend *fe,
499 { 0x00, 0x01, 0x02, 0x04, 0x3f, 0x08, 0x10, 0x20, 0x3f, 0x3f }; 499 { 0x00, 0x01, 0x02, 0x04, 0x3f, 0x08, 0x10, 0x20, 0x3f, 0x3f };
500 const u8 inv_tab[3] = { 0x00, 0x40, 0x80 }; 500 const u8 inv_tab[3] = { 0x00, 0x40, 0x80 };
501 501
502 dprintk("%s: Freq %d\n", __FUNCTION__, p->frequency); 502 dprintk("%s: Freq %d\n", __func__, p->frequency);
503 503
504 if ((p->frequency < fe->ops.info.frequency_min) 504 if ((p->frequency < fe->ops.info.frequency_min)
505 || (p->frequency > fe->ops.info.frequency_max)) 505 || (p->frequency > fe->ops.info.frequency_max))
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h
index f17cb93ba9ba..afe24fd822bd 100644
--- a/drivers/media/dvb/frontends/mt312.h
+++ b/drivers/media/dvb/frontends/mt312.h
@@ -40,7 +40,7 @@ struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
40static inline struct dvb_frontend *vp310_mt312_attach( 40static inline struct dvb_frontend *vp310_mt312_attach(
41 const struct mt312_config *config, struct i2c_adapter *i2c) 41 const struct mt312_config *config, struct i2c_adapter *i2c)
42{ 42{
43 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 43 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
44 return NULL; 44 return NULL;
45} 45}
46#endif /* CONFIG_DVB_MT312 */ 46#endif /* CONFIG_DVB_MT312 */
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index 7cd190b6f015..beba5aa0db50 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -95,7 +95,7 @@ static int mt352_read_register(struct mt352_state* state, u8 reg)
95 95
96 if (ret != 2) { 96 if (ret != 2) {
97 printk("%s: readreg error (reg=%d, ret==%i)\n", 97 printk("%s: readreg error (reg=%d, ret==%i)\n",
98 __FUNCTION__, reg, ret); 98 __func__, reg, ret);
99 return ret; 99 return ret;
100 } 100 }
101 101
@@ -135,7 +135,7 @@ static void mt352_calc_nominal_rate(struct mt352_state* state,
135 value = 64 * bw * (1<<16) / (7 * 8); 135 value = 64 * bw * (1<<16) / (7 * 8);
136 value = value * 1000 / adc_clock; 136 value = value * 1000 / adc_clock;
137 dprintk("%s: bw %d, adc_clock %d => 0x%x\n", 137 dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
138 __FUNCTION__, bw, adc_clock, value); 138 __func__, bw, adc_clock, value);
139 buf[0] = msb(value); 139 buf[0] = msb(value);
140 buf[1] = lsb(value); 140 buf[1] = lsb(value);
141} 141}
@@ -161,7 +161,7 @@ static void mt352_calc_input_freq(struct mt352_state* state,
161 } 161 }
162 value = -16374 * ife / adc_clock; 162 value = -16374 * ife / adc_clock;
163 dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n", 163 dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n",
164 __FUNCTION__, if2, ife, adc_clock, value, value & 0x3fff); 164 __func__, if2, ife, adc_clock, value, value & 0x3fff);
165 buf[0] = msb(value); 165 buf[0] = msb(value);
166 buf[1] = lsb(value); 166 buf[1] = lsb(value);
167} 167}
@@ -521,7 +521,7 @@ static int mt352_init(struct dvb_frontend* fe)
521 521
522 static u8 mt352_reset_attach [] = { RESET, 0xC0 }; 522 static u8 mt352_reset_attach [] = { RESET, 0xC0 };
523 523
524 dprintk("%s: hello\n",__FUNCTION__); 524 dprintk("%s: hello\n",__func__);
525 525
526 if ((mt352_read_register(state, CLOCK_CTL) & 0x10) == 0 || 526 if ((mt352_read_register(state, CLOCK_CTL) & 0x10) == 0 ||
527 (mt352_read_register(state, CONFIG) & 0x20) == 0) { 527 (mt352_read_register(state, CONFIG) & 0x20) == 0) {
diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb/frontends/mt352.h
index e9964081fd84..595092f9f0c4 100644
--- a/drivers/media/dvb/frontends/mt352.h
+++ b/drivers/media/dvb/frontends/mt352.h
@@ -58,7 +58,7 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,
58static inline struct dvb_frontend* mt352_attach(const struct mt352_config* config, 58static inline struct dvb_frontend* mt352_attach(const struct mt352_config* config,
59 struct i2c_adapter* i2c) 59 struct i2c_adapter* i2c)
60{ 60{
61 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 61 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
62 return NULL; 62 return NULL;
63} 63}
64#endif // CONFIG_DVB_MT352 64#endif // CONFIG_DVB_MT352
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index fcf964fe1d6b..23d022852543 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -74,7 +74,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len
74 74
75 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 75 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
76 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n", 76 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
77 __FUNCTION__, addr, err); 77 __func__, addr, err);
78 return -EREMOTEIO; 78 return -EREMOTEIO;
79 } 79 }
80 return 0; 80 return 0;
@@ -87,7 +87,7 @@ static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)
87 87
88 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 88 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
89 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n", 89 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
90 __FUNCTION__, addr, err); 90 __func__, addr, err);
91 return -EREMOTEIO; 91 return -EREMOTEIO;
92 } 92 }
93 return 0; 93 return 0;
@@ -104,7 +104,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg, u8 *buf, u8
104 104
105 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 105 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
106 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n", 106 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
107 __FUNCTION__, state->config->demod_address, err); 107 __func__, state->config->demod_address, err);
108 return -EREMOTEIO; 108 return -EREMOTEIO;
109 } 109 }
110 return 0; 110 return 0;
@@ -121,7 +121,7 @@ static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 le
121 121
122 if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) { 122 if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
123 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n", 123 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
124 __FUNCTION__, state->config->demod_address, err); 124 __func__, state->config->demod_address, err);
125 return -EREMOTEIO; 125 return -EREMOTEIO;
126 } 126 }
127 return 0; 127 return 0;
@@ -146,7 +146,7 @@ static u16 nxt200x_crc(u16 crc, u8 c)
146static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len) 146static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len)
147{ 147{
148 u8 attr, len2, buf; 148 u8 attr, len2, buf;
149 dprintk("%s\n", __FUNCTION__); 149 dprintk("%s\n", __func__);
150 150
151 /* set mutli register register */ 151 /* set mutli register register */
152 nxt200x_writebytes(state, 0x35, &reg, 1); 152 nxt200x_writebytes(state, 0x35, &reg, 1);
@@ -207,7 +207,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
207{ 207{
208 int i; 208 int i;
209 u8 buf, len2, attr; 209 u8 buf, len2, attr;
210 dprintk("%s\n", __FUNCTION__); 210 dprintk("%s\n", __func__);
211 211
212 /* set mutli register register */ 212 /* set mutli register register */
213 nxt200x_writebytes(state, 0x35, &reg, 1); 213 nxt200x_writebytes(state, 0x35, &reg, 1);
@@ -254,7 +254,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
254static void nxt200x_microcontroller_stop (struct nxt200x_state* state) 254static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
255{ 255{
256 u8 buf, stopval, counter = 0; 256 u8 buf, stopval, counter = 0;
257 dprintk("%s\n", __FUNCTION__); 257 dprintk("%s\n", __func__);
258 258
259 /* set correct stop value */ 259 /* set correct stop value */
260 switch (state->demod_chip) { 260 switch (state->demod_chip) {
@@ -287,7 +287,7 @@ static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
287static void nxt200x_microcontroller_start (struct nxt200x_state* state) 287static void nxt200x_microcontroller_start (struct nxt200x_state* state)
288{ 288{
289 u8 buf; 289 u8 buf;
290 dprintk("%s\n", __FUNCTION__); 290 dprintk("%s\n", __func__);
291 291
292 buf = 0x00; 292 buf = 0x00;
293 nxt200x_writebytes(state, 0x22, &buf, 1); 293 nxt200x_writebytes(state, 0x22, &buf, 1);
@@ -297,7 +297,7 @@ static void nxt2004_microcontroller_init (struct nxt200x_state* state)
297{ 297{
298 u8 buf[9]; 298 u8 buf[9];
299 u8 counter = 0; 299 u8 counter = 0;
300 dprintk("%s\n", __FUNCTION__); 300 dprintk("%s\n", __func__);
301 301
302 buf[0] = 0x00; 302 buf[0] = 0x00;
303 nxt200x_writebytes(state, 0x2b, buf, 1); 303 nxt200x_writebytes(state, 0x2b, buf, 1);
@@ -328,7 +328,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
328{ 328{
329 u8 buf, count = 0; 329 u8 buf, count = 0;
330 330
331 dprintk("%s\n", __FUNCTION__); 331 dprintk("%s\n", __func__);
332 332
333 dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]); 333 dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]);
334 334
@@ -387,7 +387,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
387static void nxt200x_agc_reset(struct nxt200x_state* state) 387static void nxt200x_agc_reset(struct nxt200x_state* state)
388{ 388{
389 u8 buf; 389 u8 buf;
390 dprintk("%s\n", __FUNCTION__); 390 dprintk("%s\n", __func__);
391 391
392 switch (state->demod_chip) { 392 switch (state->demod_chip) {
393 case NXT2002: 393 case NXT2002:
@@ -416,7 +416,7 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
416 u8 buf[3], written = 0, chunkpos = 0; 416 u8 buf[3], written = 0, chunkpos = 0;
417 u16 rambase, position, crc = 0; 417 u16 rambase, position, crc = 0;
418 418
419 dprintk("%s\n", __FUNCTION__); 419 dprintk("%s\n", __func__);
420 dprintk("Firmware is %zu bytes\n", fw->size); 420 dprintk("Firmware is %zu bytes\n", fw->size);
421 421
422 /* Get the RAM base for this nxt2002 */ 422 /* Get the RAM base for this nxt2002 */
@@ -483,7 +483,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
483 u8 buf[3]; 483 u8 buf[3];
484 u16 rambase, position, crc=0; 484 u16 rambase, position, crc=0;
485 485
486 dprintk("%s\n", __FUNCTION__); 486 dprintk("%s\n", __func__);
487 dprintk("Firmware is %zu bytes\n", fw->size); 487 dprintk("Firmware is %zu bytes\n", fw->size);
488 488
489 /* set rambase */ 489 /* set rambase */
diff --git a/drivers/media/dvb/frontends/nxt200x.h b/drivers/media/dvb/frontends/nxt200x.h
index bb0ef58d7972..f3c84583770f 100644
--- a/drivers/media/dvb/frontends/nxt200x.h
+++ b/drivers/media/dvb/frontends/nxt200x.h
@@ -49,7 +49,7 @@ extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
49static inline struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, 49static inline struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
50 struct i2c_adapter* i2c) 50 struct i2c_adapter* i2c)
51{ 51{
52 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 52 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
53 return NULL; 53 return NULL;
54} 54}
55#endif // CONFIG_DVB_NXT200X 55#endif // CONFIG_DVB_NXT200X
diff --git a/drivers/media/dvb/frontends/nxt6000.h b/drivers/media/dvb/frontends/nxt6000.h
index 13d22518356e..878eb38a075e 100644
--- a/drivers/media/dvb/frontends/nxt6000.h
+++ b/drivers/media/dvb/frontends/nxt6000.h
@@ -40,7 +40,7 @@ extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
40static inline struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config, 40static inline struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
41 struct i2c_adapter* i2c) 41 struct i2c_adapter* i2c)
42{ 42{
43 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 43 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
44 return NULL; 44 return NULL;
45} 45}
46#endif // CONFIG_DVB_NXT6000 46#endif // CONFIG_DVB_NXT6000
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 8ffb8daca031..c7b5785f81f2 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -419,7 +419,7 @@ static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status)
419 *status = 0; 419 *status = 0;
420 return -EREMOTEIO; 420 return -EREMOTEIO;
421 } 421 }
422 dprintk("%s: read_status %04x\n", __FUNCTION__, reg); 422 dprintk("%s: read_status %04x\n", __func__, reg);
423 423
424 if (reg & 0x0100) /* Receiver Lock */ 424 if (reg & 0x0100) /* Receiver Lock */
425 *status = FE_HAS_SIGNAL|FE_HAS_CARRIER|FE_HAS_VITERBI| 425 *status = FE_HAS_SIGNAL|FE_HAS_CARRIER|FE_HAS_VITERBI|
@@ -504,14 +504,14 @@ start:
504 if (retry--) goto start; 504 if (retry--) goto start;
505 return -EREMOTEIO; 505 return -EREMOTEIO;
506 } 506 }
507 dprintk("%s: modulation %02x, NTSC rej O%s\n", __FUNCTION__, 507 dprintk("%s: modulation %02x, NTSC rej O%s\n", __func__,
508 reg&0xff, reg&0x1000?"n":"ff"); 508 reg&0xff, reg&0x1000?"n":"ff");
509 509
510 /* Calculate SNR using noise, c, and NTSC rejection correction */ 510 /* Calculate SNR using noise, c, and NTSC rejection correction */
511 state->snr = calculate_snr(noise, c) - usK; 511 state->snr = calculate_snr(noise, c) - usK;
512 *snr = (state->snr) >> 16; 512 *snr = (state->snr) >> 16;
513 513
514 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __FUNCTION__, noise, 514 dprintk("%s: noise = 0x%08x, snr = %d.%02d dB\n", __func__, noise,
515 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); 515 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
516 516
517 return 0; 517 return 0;
diff --git a/drivers/media/dvb/frontends/or51132.h b/drivers/media/dvb/frontends/or51132.h
index add24f0a743b..1b8e04d973c8 100644
--- a/drivers/media/dvb/frontends/or51132.h
+++ b/drivers/media/dvb/frontends/or51132.h
@@ -41,7 +41,7 @@ extern struct dvb_frontend* or51132_attach(const struct or51132_config* config,
41static inline struct dvb_frontend* or51132_attach(const struct or51132_config* config, 41static inline struct dvb_frontend* or51132_attach(const struct or51132_config* config,
42 struct i2c_adapter* i2c) 42 struct i2c_adapter* i2c)
43{ 43{
44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
45 return NULL; 45 return NULL;
46} 46}
47#endif // CONFIG_DVB_OR51132 47#endif // CONFIG_DVB_OR51132
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 6a6b0d727c6f..7eaa4765593f 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -307,19 +307,19 @@ static int or51211_read_snr(struct dvb_frontend* fe, u16* snr)
307 307
308 if (i2c_writebytes(state,state->config->demod_address,snd_buf,3)) { 308 if (i2c_writebytes(state,state->config->demod_address,snd_buf,3)) {
309 printk(KERN_WARNING "%s: error writing snr reg\n", 309 printk(KERN_WARNING "%s: error writing snr reg\n",
310 __FUNCTION__); 310 __func__);
311 return -1; 311 return -1;
312 } 312 }
313 if (i2c_readbytes(state,state->config->demod_address,rec_buf,2)) { 313 if (i2c_readbytes(state,state->config->demod_address,rec_buf,2)) {
314 printk(KERN_WARNING "%s: read_status read error\n", 314 printk(KERN_WARNING "%s: read_status read error\n",
315 __FUNCTION__); 315 __func__);
316 return -1; 316 return -1;
317 } 317 }
318 318
319 state->snr = calculate_snr(rec_buf[0], 89599047); 319 state->snr = calculate_snr(rec_buf[0], 89599047);
320 *snr = (state->snr) >> 16; 320 *snr = (state->snr) >> 16;
321 321
322 dprintk("%s: noise = 0x%02x, snr = %d.%02d dB\n", __FUNCTION__, rec_buf[0], 322 dprintk("%s: noise = 0x%02x, snr = %d.%02d dB\n", __func__, rec_buf[0],
323 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16); 323 state->snr >> 24, (((state->snr>>8) & 0xffff) * 100) >> 16);
324 324
325 return 0; 325 return 0;
diff --git a/drivers/media/dvb/frontends/or51211.h b/drivers/media/dvb/frontends/or51211.h
index 8aad8402d615..3ce0508b898e 100644
--- a/drivers/media/dvb/frontends/or51211.h
+++ b/drivers/media/dvb/frontends/or51211.h
@@ -44,7 +44,7 @@ extern struct dvb_frontend* or51211_attach(const struct or51211_config* config,
44static inline struct dvb_frontend* or51211_attach(const struct or51211_config* config, 44static inline struct dvb_frontend* or51211_attach(const struct or51211_config* config,
45 struct i2c_adapter* i2c) 45 struct i2c_adapter* i2c)
46{ 46{
47 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 47 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
48 return NULL; 48 return NULL;
49} 49}
50#endif // CONFIG_DVB_OR51211 50#endif // CONFIG_DVB_OR51211
diff --git a/drivers/media/dvb/frontends/qt1010.h b/drivers/media/dvb/frontends/qt1010.h
index 3ab4aa045c36..cff6a7ca5380 100644
--- a/drivers/media/dvb/frontends/qt1010.h
+++ b/drivers/media/dvb/frontends/qt1010.h
@@ -45,7 +45,7 @@ static inline struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe,
45 struct i2c_adapter *i2c, 45 struct i2c_adapter *i2c,
46 struct qt1010_config *cfg) 46 struct qt1010_config *cfg)
47{ 47{
48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
49 return NULL; 49 return NULL;
50} 50}
51#endif // CONFIG_DVB_TUNER_QT1010 51#endif // CONFIG_DVB_TUNER_QT1010
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 1ca250378664..b999ec424ff7 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -312,7 +312,7 @@ static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)
312 312
313 if (ret != 1) 313 if (ret != 1)
314 printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, " 314 printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, "
315 "ret == %i)\n", __FUNCTION__, reg, data, ret); 315 "ret == %i)\n", __func__, reg, data, ret);
316 316
317 return (ret != 1) ? -1 : 0; 317 return (ret != 1) ? -1 : 0;
318} 318}
@@ -332,7 +332,7 @@ static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)
332 ret = i2c_transfer(state->i2c, msg, 2); 332 ret = i2c_transfer(state->i2c, msg, 2);
333 333
334 if (ret != 2) 334 if (ret != 2)
335 printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); 335 printk("%s: readreg error (ret == %i)\n", __func__, ret);
336 return (b1[0] << 8) | b1[1]; 336 return (b1[0] << 8) | b1[1];
337} 337}
338 338
@@ -340,7 +340,7 @@ static int s5h1409_softreset(struct dvb_frontend* fe)
340{ 340{
341 struct s5h1409_state* state = fe->demodulator_priv; 341 struct s5h1409_state* state = fe->demodulator_priv;
342 342
343 dprintk("%s()\n", __FUNCTION__); 343 dprintk("%s()\n", __func__);
344 344
345 s5h1409_writereg(state, 0xf5, 0); 345 s5h1409_writereg(state, 0xf5, 0);
346 s5h1409_writereg(state, 0xf5, 1); 346 s5h1409_writereg(state, 0xf5, 1);
@@ -356,7 +356,7 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)
356{ 356{
357 struct s5h1409_state* state = fe->demodulator_priv; 357 struct s5h1409_state* state = fe->demodulator_priv;
358 358
359 dprintk("%s(%d KHz)\n", __FUNCTION__, KHz); 359 dprintk("%s(%d KHz)\n", __func__, KHz);
360 360
361 switch (KHz) { 361 switch (KHz) {
362 case 4000: 362 case 4000:
@@ -381,7 +381,7 @@ static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted)
381{ 381{
382 struct s5h1409_state* state = fe->demodulator_priv; 382 struct s5h1409_state* state = fe->demodulator_priv;
383 383
384 dprintk("%s(%d)\n", __FUNCTION__, inverted); 384 dprintk("%s(%d)\n", __func__, inverted);
385 385
386 if(inverted == 1) 386 if(inverted == 1)
387 return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */ 387 return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */
@@ -394,25 +394,25 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,
394{ 394{
395 struct s5h1409_state* state = fe->demodulator_priv; 395 struct s5h1409_state* state = fe->demodulator_priv;
396 396
397 dprintk("%s(0x%08x)\n", __FUNCTION__, m); 397 dprintk("%s(0x%08x)\n", __func__, m);
398 398
399 switch(m) { 399 switch(m) {
400 case VSB_8: 400 case VSB_8:
401 dprintk("%s() VSB_8\n", __FUNCTION__); 401 dprintk("%s() VSB_8\n", __func__);
402 if (state->if_freq != S5H1409_VSB_IF_FREQ) 402 if (state->if_freq != S5H1409_VSB_IF_FREQ)
403 s5h1409_set_if_freq(fe, S5H1409_VSB_IF_FREQ); 403 s5h1409_set_if_freq(fe, S5H1409_VSB_IF_FREQ);
404 s5h1409_writereg(state, 0xf4, 0); 404 s5h1409_writereg(state, 0xf4, 0);
405 break; 405 break;
406 case QAM_64: 406 case QAM_64:
407 case QAM_256: 407 case QAM_256:
408 dprintk("%s() QAM_AUTO (64/256)\n", __FUNCTION__); 408 dprintk("%s() QAM_AUTO (64/256)\n", __func__);
409 if (state->if_freq != S5H1409_QAM_IF_FREQ) 409 if (state->if_freq != S5H1409_QAM_IF_FREQ)
410 s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ); 410 s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ);
411 s5h1409_writereg(state, 0xf4, 1); 411 s5h1409_writereg(state, 0xf4, 1);
412 s5h1409_writereg(state, 0x85, 0x110); 412 s5h1409_writereg(state, 0x85, 0x110);
413 break; 413 break;
414 default: 414 default:
415 dprintk("%s() Invalid modulation\n", __FUNCTION__); 415 dprintk("%s() Invalid modulation\n", __func__);
416 return -EINVAL; 416 return -EINVAL;
417 } 417 }
418 418
@@ -426,7 +426,7 @@ static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
426{ 426{
427 struct s5h1409_state* state = fe->demodulator_priv; 427 struct s5h1409_state* state = fe->demodulator_priv;
428 428
429 dprintk("%s(%d)\n", __FUNCTION__, enable); 429 dprintk("%s(%d)\n", __func__, enable);
430 430
431 if (enable) 431 if (enable)
432 return s5h1409_writereg(state, 0xf3, 1); 432 return s5h1409_writereg(state, 0xf3, 1);
@@ -438,7 +438,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
438{ 438{
439 struct s5h1409_state* state = fe->demodulator_priv; 439 struct s5h1409_state* state = fe->demodulator_priv;
440 440
441 dprintk("%s(%d)\n", __FUNCTION__, enable); 441 dprintk("%s(%d)\n", __func__, enable);
442 442
443 if (enable) 443 if (enable)
444 return s5h1409_writereg(state, 0xe3, 444 return s5h1409_writereg(state, 0xe3,
@@ -452,7 +452,7 @@ static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
452{ 452{
453 struct s5h1409_state* state = fe->demodulator_priv; 453 struct s5h1409_state* state = fe->demodulator_priv;
454 454
455 dprintk("%s(%d)\n", __FUNCTION__, enable); 455 dprintk("%s(%d)\n", __func__, enable);
456 456
457 return s5h1409_writereg(state, 0xf2, enable); 457 return s5h1409_writereg(state, 0xf2, enable);
458} 458}
@@ -461,7 +461,7 @@ static int s5h1409_register_reset(struct dvb_frontend* fe)
461{ 461{
462 struct s5h1409_state* state = fe->demodulator_priv; 462 struct s5h1409_state* state = fe->demodulator_priv;
463 463
464 dprintk("%s()\n", __FUNCTION__); 464 dprintk("%s()\n", __func__);
465 465
466 return s5h1409_writereg(state, 0xfa, 0); 466 return s5h1409_writereg(state, 0xfa, 0);
467} 467}
@@ -534,7 +534,7 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe,
534{ 534{
535 struct s5h1409_state* state = fe->demodulator_priv; 535 struct s5h1409_state* state = fe->demodulator_priv;
536 536
537 dprintk("%s(frequency=%d)\n", __FUNCTION__, p->frequency); 537 dprintk("%s(frequency=%d)\n", __func__, p->frequency);
538 538
539 s5h1409_softreset(fe); 539 s5h1409_softreset(fe);
540 540
@@ -565,7 +565,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
565 struct s5h1409_state *state = fe->demodulator_priv; 565 struct s5h1409_state *state = fe->demodulator_priv;
566 u16 val; 566 u16 val;
567 567
568 dprintk("%s(%d)\n", __FUNCTION__, mode); 568 dprintk("%s(%d)\n", __func__, mode);
569 569
570 val = s5h1409_readreg(state, 0xac) & 0xcfff; 570 val = s5h1409_readreg(state, 0xac) & 0xcfff;
571 switch (mode) { 571 switch (mode) {
@@ -573,7 +573,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
573 val |= 0x0000; 573 val |= 0x0000;
574 break; 574 break;
575 case S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK: 575 case S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK:
576 dprintk("%s(%d) Mode1 or Defaulting\n", __FUNCTION__, mode); 576 dprintk("%s(%d) Mode1 or Defaulting\n", __func__, mode);
577 val |= 0x1000; 577 val |= 0x1000;
578 break; 578 break;
579 case S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK: 579 case S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK:
@@ -597,7 +597,7 @@ static int s5h1409_init (struct dvb_frontend* fe)
597 int i; 597 int i;
598 598
599 struct s5h1409_state* state = fe->demodulator_priv; 599 struct s5h1409_state* state = fe->demodulator_priv;
600 dprintk("%s()\n", __FUNCTION__); 600 dprintk("%s()\n", __func__);
601 601
602 s5h1409_sleep(fe, 0); 602 s5h1409_sleep(fe, 0);
603 s5h1409_register_reset(fe); 603 s5h1409_register_reset(fe);
@@ -663,7 +663,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
663 break; 663 break;
664 } 664 }
665 665
666 dprintk("%s() status 0x%08x\n", __FUNCTION__, *status); 666 dprintk("%s() status 0x%08x\n", __func__, *status);
667 667
668 return 0; 668 return 0;
669} 669}
@@ -671,7 +671,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
671static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) 671static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
672{ 672{
673 int i, ret = -EINVAL; 673 int i, ret = -EINVAL;
674 dprintk("%s()\n", __FUNCTION__); 674 dprintk("%s()\n", __func__);
675 675
676 for (i=0; i < ARRAY_SIZE(qam256_snr_tab); i++) { 676 for (i=0; i < ARRAY_SIZE(qam256_snr_tab); i++) {
677 if (v < qam256_snr_tab[i].val) { 677 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)
686static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) 686static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
687{ 687{
688 int i, ret = -EINVAL; 688 int i, ret = -EINVAL;
689 dprintk("%s()\n", __FUNCTION__); 689 dprintk("%s()\n", __func__);
690 690
691 for (i=0; i < ARRAY_SIZE(qam64_snr_tab); i++) { 691 for (i=0; i < ARRAY_SIZE(qam64_snr_tab); i++) {
692 if (v < qam64_snr_tab[i].val) { 692 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)
701static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v) 701static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
702{ 702{
703 int i, ret = -EINVAL; 703 int i, ret = -EINVAL;
704 dprintk("%s()\n", __FUNCTION__); 704 dprintk("%s()\n", __func__);
705 705
706 for (i=0; i < ARRAY_SIZE(vsb_snr_tab); i++) { 706 for (i=0; i < ARRAY_SIZE(vsb_snr_tab); i++) {
707 if (v > vsb_snr_tab[i].val) { 707 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 break; 710 break;
711 } 711 }
712 } 712 }
713 dprintk("%s() snr=%d\n", __FUNCTION__, *snr); 713 dprintk("%s() snr=%d\n", __func__, *snr);
714 return ret; 714 return ret;
715} 715}
716 716
@@ -718,7 +718,7 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)
718{ 718{
719 struct s5h1409_state* state = fe->demodulator_priv; 719 struct s5h1409_state* state = fe->demodulator_priv;
720 u16 reg; 720 u16 reg;
721 dprintk("%s()\n", __FUNCTION__); 721 dprintk("%s()\n", __func__);
722 722
723 switch(state->current_modulation) { 723 switch(state->current_modulation) {
724 case QAM_64: 724 case QAM_64:
@@ -812,7 +812,7 @@ struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
812 812
813 if (s5h1409_init(&state->frontend) != 0) { 813 if (s5h1409_init(&state->frontend) != 0) {
814 printk(KERN_ERR "%s: Failed to initialize correctly\n", 814 printk(KERN_ERR "%s: Failed to initialize correctly\n",
815 __FUNCTION__); 815 __func__);
816 goto error; 816 goto error;
817 } 817 }
818 818
diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h
index f0bb13fe808b..59f4335964c6 100644
--- a/drivers/media/dvb/frontends/s5h1409.h
+++ b/drivers/media/dvb/frontends/s5h1409.h
@@ -67,7 +67,7 @@ extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
67static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config, 67static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
68 struct i2c_adapter* i2c) 68 struct i2c_adapter* i2c)
69{ 69{
70 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 70 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
71 return NULL; 71 return NULL;
72} 72}
73#endif /* CONFIG_DVB_S5H1409 */ 73#endif /* CONFIG_DVB_S5H1409 */
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 7c64af91e5ac..1e2d602d371a 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -63,7 +63,7 @@ static int s5h1420_writereg (struct s5h1420_state* state, u8 reg, u8 data)
63 int err; 63 int err;
64 64
65 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 65 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
66 dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); 66 dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
67 return -EREMOTEIO; 67 return -EREMOTEIO;
68 } 68 }
69 69
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h
index 1555870f7226..2cc785012b23 100644
--- a/drivers/media/dvb/frontends/s5h1420.h
+++ b/drivers/media/dvb/frontends/s5h1420.h
@@ -41,7 +41,7 @@ extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
41static inline struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config, 41static inline struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
42 struct i2c_adapter* i2c) 42 struct i2c_adapter* i2c)
43{ 43{
44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 44 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
45 return NULL; 45 return NULL;
46} 46}
47#endif // CONFIG_DVB_S5H1420 47#endif // CONFIG_DVB_S5H1420
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index f5b3bfc00436..aa78aa14aad9 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -70,7 +70,7 @@ static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data)
70 int err; 70 int err;
71 71
72 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 72 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
73 dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); 73 dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
74 return -EREMOTEIO; 74 return -EREMOTEIO;
75 } 75 }
76 76
@@ -88,7 +88,7 @@ static int sp8870_readreg (struct sp8870_state* state, u16 reg)
88 ret = i2c_transfer (state->i2c, msg, 2); 88 ret = i2c_transfer (state->i2c, msg, 2);
89 89
90 if (ret != 2) { 90 if (ret != 2) {
91 dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); 91 dprintk("%s: readreg error (ret == %i)\n", __func__, ret);
92 return -1; 92 return -1;
93 } 93 }
94 94
@@ -104,7 +104,7 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm
104 int tx_len; 104 int tx_len;
105 int err = 0; 105 int err = 0;
106 106
107 dprintk ("%s: ...\n", __FUNCTION__); 107 dprintk ("%s: ...\n", __func__);
108 108
109 if (fw->size < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET) 109 if (fw->size < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET)
110 return -EINVAL; 110 return -EINVAL;
@@ -131,14 +131,14 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm
131 msg.buf = tx_buf; 131 msg.buf = tx_buf;
132 msg.len = tx_len + 2; 132 msg.len = tx_len + 2;
133 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 133 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
134 printk("%s: firmware upload failed!\n", __FUNCTION__); 134 printk("%s: firmware upload failed!\n", __func__);
135 printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err); 135 printk ("%s: i2c error (err == %i)\n", __func__, err);
136 return err; 136 return err;
137 } 137 }
138 fw_pos += tx_len; 138 fw_pos += tx_len;
139 } 139 }
140 140
141 dprintk ("%s: done!\n", __FUNCTION__); 141 dprintk ("%s: done!\n", __func__);
142 return 0; 142 return 0;
143}; 143};
144 144
@@ -310,7 +310,7 @@ static int sp8870_init (struct dvb_frontend* fe)
310 if (state->initialised) return 0; 310 if (state->initialised) return 0;
311 state->initialised = 1; 311 state->initialised = 1;
312 312
313 dprintk ("%s\n", __FUNCTION__); 313 dprintk ("%s\n", __func__);
314 314
315 315
316 /* request the firmware, this will block until someone uploads it */ 316 /* 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 int trials = 0; 475 int trials = 0;
476 int check_count = 0; 476 int check_count = 0;
477 477
478 dprintk("%s: frequency = %i\n", __FUNCTION__, p->frequency); 478 dprintk("%s: frequency = %i\n", __func__, p->frequency);
479 479
480 for (trials = 1; trials <= MAXTRIALS; trials++) { 480 for (trials = 1; trials <= MAXTRIALS; trials++) {
481 481
@@ -487,7 +487,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
487 valid = sp8870_read_data_valid_signal(state); 487 valid = sp8870_read_data_valid_signal(state);
488 if (valid) { 488 if (valid) {
489 dprintk("%s: delay = %i usec\n", 489 dprintk("%s: delay = %i usec\n",
490 __FUNCTION__, check_count * 10); 490 __func__, check_count * 10);
491 break; 491 break;
492 } 492 }
493 udelay(10); 493 udelay(10);
@@ -497,20 +497,20 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
497 } 497 }
498 498
499 if (!valid) { 499 if (!valid) {
500 printk("%s: firmware crash!!!!!!\n", __FUNCTION__); 500 printk("%s: firmware crash!!!!!!\n", __func__);
501 return -EIO; 501 return -EIO;
502 } 502 }
503 503
504 if (debug) { 504 if (debug) {
505 if (valid) { 505 if (valid) {
506 if (trials > 1) { 506 if (trials > 1) {
507 printk("%s: firmware lockup!!!\n", __FUNCTION__); 507 printk("%s: firmware lockup!!!\n", __func__);
508 printk("%s: recovered after %i trial(s))\n", __FUNCTION__, trials - 1); 508 printk("%s: recovered after %i trial(s))\n", __func__, trials - 1);
509 lockups++; 509 lockups++;
510 } 510 }
511 } 511 }
512 switches++; 512 switches++;
513 printk("%s: switches = %i lockups = %i\n", __FUNCTION__, switches, lockups); 513 printk("%s: switches = %i lockups = %i\n", __func__, switches, lockups);
514 } 514 }
515 515
516 return 0; 516 return 0;
diff --git a/drivers/media/dvb/frontends/sp8870.h b/drivers/media/dvb/frontends/sp8870.h
index 909cefe7139e..a764a793c7d8 100644
--- a/drivers/media/dvb/frontends/sp8870.h
+++ b/drivers/media/dvb/frontends/sp8870.h
@@ -42,7 +42,7 @@ extern struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,
42static inline struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, 42static inline struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,
43 struct i2c_adapter* i2c) 43 struct i2c_adapter* i2c)
44{ 44{
45 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 45 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
46 return NULL; 46 return NULL;
47} 47}
48#endif // CONFIG_DVB_SP8870 48#endif // CONFIG_DVB_SP8870
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 1aa2539f5099..49f55877f513 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -43,7 +43,7 @@ static int i2c_writebytes (struct sp887x_state* state, u8 *buf, u8 len)
43 43
44 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 44 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
45 printk ("%s: i2c write error (addr %02x, err == %i)\n", 45 printk ("%s: i2c write error (addr %02x, err == %i)\n",
46 __FUNCTION__, state->config->demod_address, err); 46 __func__, state->config->demod_address, err);
47 return -EREMOTEIO; 47 return -EREMOTEIO;
48 } 48 }
49 49
@@ -65,7 +65,7 @@ static int sp887x_writereg (struct sp887x_state* state, u16 reg, u16 data)
65 { 65 {
66 printk("%s: writereg error " 66 printk("%s: writereg error "
67 "(reg %03x, data %03x, ret == %i)\n", 67 "(reg %03x, data %03x, ret == %i)\n",
68 __FUNCTION__, reg & 0xffff, data & 0xffff, ret); 68 __func__, reg & 0xffff, data & 0xffff, ret);
69 return ret; 69 return ret;
70 } 70 }
71 } 71 }
@@ -82,7 +82,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
82 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }}; 82 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
83 83
84 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { 84 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
85 printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); 85 printk("%s: readreg error (ret == %i)\n", __func__, ret);
86 return -1; 86 return -1;
87 } 87 }
88 88
@@ -91,7 +91,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
91 91
92static void sp887x_microcontroller_stop (struct sp887x_state* state) 92static void sp887x_microcontroller_stop (struct sp887x_state* state)
93{ 93{
94 dprintk("%s\n", __FUNCTION__); 94 dprintk("%s\n", __func__);
95 sp887x_writereg(state, 0xf08, 0x000); 95 sp887x_writereg(state, 0xf08, 0x000);
96 sp887x_writereg(state, 0xf09, 0x000); 96 sp887x_writereg(state, 0xf09, 0x000);
97 97
@@ -101,7 +101,7 @@ static void sp887x_microcontroller_stop (struct sp887x_state* state)
101 101
102static void sp887x_microcontroller_start (struct sp887x_state* state) 102static void sp887x_microcontroller_start (struct sp887x_state* state)
103{ 103{
104 dprintk("%s\n", __FUNCTION__); 104 dprintk("%s\n", __func__);
105 sp887x_writereg(state, 0xf08, 0x000); 105 sp887x_writereg(state, 0xf08, 0x000);
106 sp887x_writereg(state, 0xf09, 0x000); 106 sp887x_writereg(state, 0xf09, 0x000);
107 107
@@ -112,7 +112,7 @@ static void sp887x_microcontroller_start (struct sp887x_state* state)
112static void sp887x_setup_agc (struct sp887x_state* state) 112static void sp887x_setup_agc (struct sp887x_state* state)
113{ 113{
114 /* setup AGC parameters */ 114 /* setup AGC parameters */
115 dprintk("%s\n", __FUNCTION__); 115 dprintk("%s\n", __func__);
116 sp887x_writereg(state, 0x33c, 0x054); 116 sp887x_writereg(state, 0x33c, 0x054);
117 sp887x_writereg(state, 0x33b, 0x04c); 117 sp887x_writereg(state, 0x33b, 0x04c);
118 sp887x_writereg(state, 0x328, 0x000); 118 sp887x_writereg(state, 0x328, 0x000);
@@ -142,7 +142,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
142 int fw_size = fw->size; 142 int fw_size = fw->size;
143 unsigned char *mem = fw->data; 143 unsigned char *mem = fw->data;
144 144
145 dprintk("%s\n", __FUNCTION__); 145 dprintk("%s\n", __func__);
146 146
147 /* ignore the first 10 bytes, then we expect 0x4000 bytes of firmware */ 147 /* ignore the first 10 bytes, then we expect 0x4000 bytes of firmware */
148 if (fw_size < FW_SIZE+10) 148 if (fw_size < FW_SIZE+10)
@@ -155,7 +155,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
155 155
156 sp887x_microcontroller_stop (state); 156 sp887x_microcontroller_stop (state);
157 157
158 printk ("%s: firmware upload... ", __FUNCTION__); 158 printk ("%s: firmware upload... ", __func__);
159 159
160 /* setup write pointer to -1 (end of memory) */ 160 /* setup write pointer to -1 (end of memory) */
161 /* bit 0x8000 in address is set to enable 13bit mode */ 161 /* 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 181
182 if ((err = i2c_writebytes (state, buf, c+2)) < 0) { 182 if ((err = i2c_writebytes (state, buf, c+2)) < 0) {
183 printk ("failed.\n"); 183 printk ("failed.\n");
184 printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err); 184 printk ("%s: i2c error (err == %i)\n", __func__, err);
185 return err; 185 return err;
186 } 186 }
187 } 187 }
diff --git a/drivers/media/dvb/frontends/sp887x.h b/drivers/media/dvb/frontends/sp887x.h
index 7ee78d7d916d..04eff6e0eef3 100644
--- a/drivers/media/dvb/frontends/sp887x.h
+++ b/drivers/media/dvb/frontends/sp887x.h
@@ -24,7 +24,7 @@ extern struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
24static inline struct dvb_frontend* sp887x_attach(const struct sp887x_config* config, 24static inline struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
25 struct i2c_adapter* i2c) 25 struct i2c_adapter* i2c)
26{ 26{
27 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 27 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
28 return NULL; 28 return NULL;
29} 29}
30#endif // CONFIG_DVB_SP887X 30#endif // CONFIG_DVB_SP887X
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 7c23775f77db..62caf802ed99 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -58,7 +58,7 @@ static int stv0297_writereg(struct stv0297_state *state, u8 reg, u8 data)
58 58
59 if (ret != 1) 59 if (ret != 1)
60 dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, " 60 dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, "
61 "ret == %i)\n", __FUNCTION__, reg, data, ret); 61 "ret == %i)\n", __func__, reg, data, ret);
62 62
63 return (ret != 1) ? -1 : 0; 63 return (ret != 1) ? -1 : 0;
64} 64}
@@ -75,16 +75,16 @@ static int stv0297_readreg(struct stv0297_state *state, u8 reg)
75 // this device needs a STOP between the register and data 75 // this device needs a STOP between the register and data
76 if (state->config->stop_during_read) { 76 if (state->config->stop_during_read) {
77 if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { 77 if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) {
78 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); 78 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret);
79 return -1; 79 return -1;
80 } 80 }
81 if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { 81 if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) {
82 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); 82 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret);
83 return -1; 83 return -1;
84 } 84 }
85 } else { 85 } else {
86 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { 86 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
87 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); 87 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret);
88 return -1; 88 return -1;
89 } 89 }
90 } 90 }
@@ -115,16 +115,16 @@ static int stv0297_readregs(struct stv0297_state *state, u8 reg1, u8 * b, u8 len
115 // this device needs a STOP between the register and data 115 // this device needs a STOP between the register and data
116 if (state->config->stop_during_read) { 116 if (state->config->stop_during_read) {
117 if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { 117 if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) {
118 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); 118 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret);
119 return -1; 119 return -1;
120 } 120 }
121 if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { 121 if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) {
122 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); 122 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret);
123 return -1; 123 return -1;
124 } 124 }
125 } else { 125 } else {
126 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { 126 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
127 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); 127 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret);
128 return -1; 128 return -1;
129 } 129 }
130 } 130 }
diff --git a/drivers/media/dvb/frontends/stv0297.h b/drivers/media/dvb/frontends/stv0297.h
index 69f4515df2b9..3f8f9468f387 100644
--- a/drivers/media/dvb/frontends/stv0297.h
+++ b/drivers/media/dvb/frontends/stv0297.h
@@ -49,7 +49,7 @@ extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
49static inline struct dvb_frontend* stv0297_attach(const struct stv0297_config* config, 49static inline struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
50 struct i2c_adapter* i2c) 50 struct i2c_adapter* i2c)
51{ 51{
52 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 52 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
53 return NULL; 53 return NULL;
54} 54}
55#endif // CONFIG_DVB_STV0297 55#endif // CONFIG_DVB_STV0297
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 035dd7ba6519..f7c36741537d 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -86,7 +86,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
86 86
87 if (ret != 1) 87 if (ret != 1)
88 dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, " 88 dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, "
89 "ret == %i)\n", __FUNCTION__, reg, data, ret); 89 "ret == %i)\n", __func__, reg, data, ret);
90 90
91 return (ret != 1) ? -EREMOTEIO : 0; 91 return (ret != 1) ? -EREMOTEIO : 0;
92} 92}
@@ -113,7 +113,7 @@ static u8 stv0299_readreg (struct stv0299_state* state, u8 reg)
113 113
114 if (ret != 2) 114 if (ret != 2)
115 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", 115 dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",
116 __FUNCTION__, reg, ret); 116 __func__, reg, ret);
117 117
118 return b1[0]; 118 return b1[0];
119} 119}
@@ -127,14 +127,14 @@ static int stv0299_readregs (struct stv0299_state* state, u8 reg1, u8 *b, u8 len
127 ret = i2c_transfer (state->i2c, msg, 2); 127 ret = i2c_transfer (state->i2c, msg, 2);
128 128
129 if (ret != 2) 129 if (ret != 2)
130 dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); 130 dprintk("%s: readreg error (ret == %i)\n", __func__, ret);
131 131
132 return ret == 2 ? 0 : ret; 132 return ret == 2 ? 0 : ret;
133} 133}
134 134
135static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec) 135static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec)
136{ 136{
137 dprintk ("%s\n", __FUNCTION__); 137 dprintk ("%s\n", __func__);
138 138
139 switch (fec) { 139 switch (fec) {
140 case FEC_AUTO: 140 case FEC_AUTO:
@@ -174,7 +174,7 @@ static fe_code_rate_t stv0299_get_fec (struct stv0299_state* state)
174 FEC_7_8, FEC_1_2 }; 174 FEC_7_8, FEC_1_2 };
175 u8 index; 175 u8 index;
176 176
177 dprintk ("%s\n", __FUNCTION__); 177 dprintk ("%s\n", __func__);
178 178
179 index = stv0299_readreg (state, 0x1b); 179 index = stv0299_readreg (state, 0x1b);
180 index &= 0x7; 180 index &= 0x7;
@@ -189,11 +189,11 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
189{ 189{
190 unsigned long start = jiffies; 190 unsigned long start = jiffies;
191 191
192 dprintk ("%s\n", __FUNCTION__); 192 dprintk ("%s\n", __func__);
193 193
194 while (stv0299_readreg(state, 0x0a) & 1) { 194 while (stv0299_readreg(state, 0x0a) & 1) {
195 if (jiffies - start > timeout) { 195 if (jiffies - start > timeout) {
196 dprintk ("%s: timeout!!\n", __FUNCTION__); 196 dprintk ("%s: timeout!!\n", __func__);
197 return -ETIMEDOUT; 197 return -ETIMEDOUT;
198 } 198 }
199 msleep(10); 199 msleep(10);
@@ -206,11 +206,11 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
206{ 206{
207 unsigned long start = jiffies; 207 unsigned long start = jiffies;
208 208
209 dprintk ("%s\n", __FUNCTION__); 209 dprintk ("%s\n", __func__);
210 210
211 while ((stv0299_readreg(state, 0x0a) & 3) != 2 ) { 211 while ((stv0299_readreg(state, 0x0a) & 3) != 2 ) {
212 if (jiffies - start > timeout) { 212 if (jiffies - start > timeout) {
213 dprintk ("%s: timeout!!\n", __FUNCTION__); 213 dprintk ("%s: timeout!!\n", __func__);
214 return -ETIMEDOUT; 214 return -ETIMEDOUT;
215 } 215 }
216 msleep(10); 216 msleep(10);
@@ -245,7 +245,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
245 u8 sfr[3]; 245 u8 sfr[3];
246 s8 rtf; 246 s8 rtf;
247 247
248 dprintk ("%s\n", __FUNCTION__); 248 dprintk ("%s\n", __func__);
249 249
250 stv0299_readregs (state, 0x1f, sfr, 3); 250 stv0299_readregs (state, 0x1f, sfr, 3);
251 stv0299_readregs (state, 0x1a, (u8 *)&rtf, 1); 251 stv0299_readregs (state, 0x1a, (u8 *)&rtf, 1);
@@ -257,8 +257,8 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
257 offset = (s32) rtf * (srate / 4096L); 257 offset = (s32) rtf * (srate / 4096L);
258 offset /= 128; 258 offset /= 128;
259 259
260 dprintk ("%s : srate = %i\n", __FUNCTION__, srate); 260 dprintk ("%s : srate = %i\n", __func__, srate);
261 dprintk ("%s : ofset = %i\n", __FUNCTION__, offset); 261 dprintk ("%s : ofset = %i\n", __func__, offset);
262 262
263 srate += offset; 263 srate += offset;
264 264
@@ -276,7 +276,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
276 u8 val; 276 u8 val;
277 int i; 277 int i;
278 278
279 dprintk ("%s\n", __FUNCTION__); 279 dprintk ("%s\n", __func__);
280 280
281 if (stv0299_wait_diseqc_idle (state, 100) < 0) 281 if (stv0299_wait_diseqc_idle (state, 100) < 0)
282 return -ETIMEDOUT; 282 return -ETIMEDOUT;
@@ -305,7 +305,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
305 struct stv0299_state* state = fe->demodulator_priv; 305 struct stv0299_state* state = fe->demodulator_priv;
306 u8 val; 306 u8 val;
307 307
308 dprintk ("%s\n", __FUNCTION__); 308 dprintk ("%s\n", __func__);
309 309
310 if (stv0299_wait_diseqc_idle (state, 100) < 0) 310 if (stv0299_wait_diseqc_idle (state, 100) < 0)
311 return -ETIMEDOUT; 311 return -ETIMEDOUT;
@@ -355,7 +355,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
355 u8 reg0x08; 355 u8 reg0x08;
356 u8 reg0x0c; 356 u8 reg0x0c;
357 357
358 dprintk("%s: %s\n", __FUNCTION__, 358 dprintk("%s: %s\n", __func__,
359 voltage == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" : 359 voltage == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
360 voltage == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??"); 360 voltage == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");
361 361
@@ -408,7 +408,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long
408 408
409 cmd = cmd << 1; 409 cmd = cmd << 1;
410 if (debug_legacy_dish_switch) 410 if (debug_legacy_dish_switch)
411 printk ("%s switch command: 0x%04lx\n",__FUNCTION__, cmd); 411 printk ("%s switch command: 0x%04lx\n",__func__, cmd);
412 412
413 do_gettimeofday (&nexttime); 413 do_gettimeofday (&nexttime);
414 if (debug_legacy_dish_switch) 414 if (debug_legacy_dish_switch)
@@ -433,7 +433,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long
433 } 433 }
434 if (debug_legacy_dish_switch) { 434 if (debug_legacy_dish_switch) {
435 printk ("%s(%d): switch delay (should be 32k followed by all 8k\n", 435 printk ("%s(%d): switch delay (should be 32k followed by all 8k\n",
436 __FUNCTION__, fe->dvb->num); 436 __func__, fe->dvb->num);
437 for (i = 1; i < 10; i++) 437 for (i = 1; i < 10; i++)
438 printk ("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i])); 438 printk ("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i]));
439 } 439 }
@@ -461,7 +461,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
461 u8 signal = 0xff - stv0299_readreg (state, 0x18); 461 u8 signal = 0xff - stv0299_readreg (state, 0x18);
462 u8 sync = stv0299_readreg (state, 0x1b); 462 u8 sync = stv0299_readreg (state, 0x1b);
463 463
464 dprintk ("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __FUNCTION__, sync); 464 dprintk ("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __func__, sync);
465 *status = 0; 465 *status = 0;
466 466
467 if (signal > 10) 467 if (signal > 10)
@@ -499,7 +499,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
499 s32 signal = 0xffff - ((stv0299_readreg (state, 0x18) << 8) 499 s32 signal = 0xffff - ((stv0299_readreg (state, 0x18) << 8)
500 | stv0299_readreg (state, 0x19)); 500 | stv0299_readreg (state, 0x19));
501 501
502 dprintk ("%s : FE_READ_SIGNAL_STRENGTH : AGC2I: 0x%02x%02x, signal=0x%04x\n", __FUNCTION__, 502 dprintk ("%s : FE_READ_SIGNAL_STRENGTH : AGC2I: 0x%02x%02x, signal=0x%04x\n", __func__,
503 stv0299_readreg (state, 0x18), 503 stv0299_readreg (state, 0x18),
504 stv0299_readreg (state, 0x19), (int) signal); 504 stv0299_readreg (state, 0x19), (int) signal);
505 505
@@ -536,7 +536,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
536 struct stv0299_state* state = fe->demodulator_priv; 536 struct stv0299_state* state = fe->demodulator_priv;
537 int invval = 0; 537 int invval = 0;
538 538
539 dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__); 539 dprintk ("%s : FE_SET_FRONTEND\n", __func__);
540 540
541 // set the inversion 541 // set the inversion
542 if (p->inversion == INVERSION_OFF) invval = 0; 542 if (p->inversion == INVERSION_OFF) invval = 0;
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h
index 33df9495908f..84eaeb518540 100644
--- a/drivers/media/dvb/frontends/stv0299.h
+++ b/drivers/media/dvb/frontends/stv0299.h
@@ -96,7 +96,7 @@ extern struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
96static inline struct dvb_frontend* stv0299_attach(const struct stv0299_config* config, 96static inline struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
97 struct i2c_adapter* i2c) 97 struct i2c_adapter* i2c)
98{ 98{
99 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 99 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
100 return NULL; 100 return NULL;
101} 101}
102#endif // CONFIG_DVB_STV0299 102#endif // CONFIG_DVB_STV0299
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 45137d2ebfb9..f648fdb64bb7 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -79,7 +79,7 @@ static int _tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)
79 if (ret != 1) 79 if (ret != 1)
80 printk("DVB: TDA10021(%d): %s, writereg error " 80 printk("DVB: TDA10021(%d): %s, writereg error "
81 "(reg == 0x%02x, val == 0x%02x, ret == %i)\n", 81 "(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
82 state->frontend.dvb->num, __FUNCTION__, reg, data, ret); 82 state->frontend.dvb->num, __func__, reg, data, ret);
83 83
84 msleep(10); 84 msleep(10);
85 return (ret != 1) ? -EREMOTEIO : 0; 85 return (ret != 1) ? -EREMOTEIO : 0;
@@ -97,7 +97,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
97 // Don't print an error message if the id is read. 97 // Don't print an error message if the id is read.
98 if (ret != 2 && reg != 0x1a) 98 if (ret != 2 && reg != 0x1a)
99 printk("DVB: TDA10021: %s: readreg error (ret == %i)\n", 99 printk("DVB: TDA10021: %s: readreg error (ret == %i)\n",
100 __FUNCTION__, ret); 100 __func__, ret);
101 return b1[0]; 101 return b1[0];
102} 102}
103 103
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c
index 364bc01971a0..0727b80bc4d2 100644
--- a/drivers/media/dvb/frontends/tda10023.c
+++ b/drivers/media/dvb/frontends/tda10023.c
@@ -118,7 +118,7 @@ static u8 tda10023_readreg (struct tda10023_state* state, u8 reg)
118 ret = i2c_transfer (state->i2c, msg, 2); 118 ret = i2c_transfer (state->i2c, msg, 2);
119 if (ret != 2) 119 if (ret != 2)
120 printk("DVB: TDA10023: %s: readreg error (ret == %i)\n", 120 printk("DVB: TDA10023: %s: readreg error (ret == %i)\n",
121 __FUNCTION__, ret); 121 __func__, ret);
122 return b1[0]; 122 return b1[0];
123} 123}
124 124
@@ -132,7 +132,7 @@ static int tda10023_writereg (struct tda10023_state* state, u8 reg, u8 data)
132 if (ret != 1) 132 if (ret != 1)
133 printk("DVB: TDA10023(%d): %s, writereg error " 133 printk("DVB: TDA10023(%d): %s, writereg error "
134 "(reg == 0x%02x, val == 0x%02x, ret == %i)\n", 134 "(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
135 state->frontend.dvb->num, __FUNCTION__, reg, data, ret); 135 state->frontend.dvb->num, __func__, reg, data, ret);
136 136
137 return (ret != 1) ? -EREMOTEIO : 0; 137 return (ret != 1) ? -EREMOTEIO : 0;
138} 138}
diff --git a/drivers/media/dvb/frontends/tda1002x.h b/drivers/media/dvb/frontends/tda1002x.h
index e9094d8123f6..1bcc0d44b90b 100644
--- a/drivers/media/dvb/frontends/tda1002x.h
+++ b/drivers/media/dvb/frontends/tda1002x.h
@@ -40,7 +40,7 @@ extern struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config
40static inline struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config, 40static inline struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
41 struct i2c_adapter* i2c, u8 pwm) 41 struct i2c_adapter* i2c, u8 pwm)
42{ 42{
43 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 43 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
44 return NULL; 44 return NULL;
45} 45}
46#endif // CONFIG_DVB_TDA10021 46#endif // CONFIG_DVB_TDA10021
@@ -52,7 +52,7 @@ extern struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config
52static inline struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config, 52static inline struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config,
53 struct i2c_adapter* i2c, u8 pwm) 53 struct i2c_adapter* i2c, u8 pwm)
54{ 54{
55 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 55 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
56 return NULL; 56 return NULL;
57} 57}
58#endif // CONFIG_DVB_TDA10023 58#endif // CONFIG_DVB_TDA10023
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 8415a8a5247a..49973846373e 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -131,16 +131,16 @@ static int tda1004x_write_byteI(struct tda1004x_state *state, int reg, int data)
131 u8 buf[] = { reg, data }; 131 u8 buf[] = { reg, data };
132 struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 }; 132 struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 };
133 133
134 dprintk("%s: reg=0x%x, data=0x%x\n", __FUNCTION__, reg, data); 134 dprintk("%s: reg=0x%x, data=0x%x\n", __func__, reg, data);
135 135
136 msg.addr = state->config->demod_address; 136 msg.addr = state->config->demod_address;
137 ret = i2c_transfer(state->i2c, &msg, 1); 137 ret = i2c_transfer(state->i2c, &msg, 1);
138 138
139 if (ret != 1) 139 if (ret != 1)
140 dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n", 140 dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
141 __FUNCTION__, reg, data, ret); 141 __func__, reg, data, ret);
142 142
143 dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __FUNCTION__, 143 dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __func__,
144 reg, data, ret); 144 reg, data, ret);
145 return (ret != 1) ? -1 : 0; 145 return (ret != 1) ? -1 : 0;
146} 146}
@@ -153,19 +153,19 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg)
153 struct i2c_msg msg[] = {{ .flags = 0, .buf = b0, .len = 1 }, 153 struct i2c_msg msg[] = {{ .flags = 0, .buf = b0, .len = 1 },
154 { .flags = I2C_M_RD, .buf = b1, .len = 1 }}; 154 { .flags = I2C_M_RD, .buf = b1, .len = 1 }};
155 155
156 dprintk("%s: reg=0x%x\n", __FUNCTION__, reg); 156 dprintk("%s: reg=0x%x\n", __func__, reg);
157 157
158 msg[0].addr = state->config->demod_address; 158 msg[0].addr = state->config->demod_address;
159 msg[1].addr = state->config->demod_address; 159 msg[1].addr = state->config->demod_address;
160 ret = i2c_transfer(state->i2c, msg, 2); 160 ret = i2c_transfer(state->i2c, msg, 2);
161 161
162 if (ret != 2) { 162 if (ret != 2) {
163 dprintk("%s: error reg=0x%x, ret=%i\n", __FUNCTION__, reg, 163 dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg,
164 ret); 164 ret);
165 return -1; 165 return -1;
166 } 166 }
167 167
168 dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __FUNCTION__, 168 dprintk("%s: success reg=0x%x, data=0x%x, ret=%i\n", __func__,
169 reg, b1[0], ret); 169 reg, b1[0], ret);
170 return b1[0]; 170 return b1[0];
171} 171}
@@ -173,7 +173,7 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg)
173static int tda1004x_write_mask(struct tda1004x_state *state, int reg, int mask, int data) 173static int tda1004x_write_mask(struct tda1004x_state *state, int reg, int mask, int data)
174{ 174{
175 int val; 175 int val;
176 dprintk("%s: reg=0x%x, mask=0x%x, data=0x%x\n", __FUNCTION__, reg, 176 dprintk("%s: reg=0x%x, mask=0x%x, data=0x%x\n", __func__, reg,
177 mask, data); 177 mask, data);
178 178
179 // read a byte and check 179 // read a byte and check
@@ -194,7 +194,7 @@ static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned ch
194 int i; 194 int i;
195 int result; 195 int result;
196 196
197 dprintk("%s: reg=0x%x, len=0x%x\n", __FUNCTION__, reg, len); 197 dprintk("%s: reg=0x%x, len=0x%x\n", __func__, reg, len);
198 198
199 result = 0; 199 result = 0;
200 for (i = 0; i < len; i++) { 200 for (i = 0; i < len; i++) {
@@ -209,7 +209,7 @@ static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned ch
209static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state) 209static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state)
210{ 210{
211 int result; 211 int result;
212 dprintk("%s\n", __FUNCTION__); 212 dprintk("%s\n", __func__);
213 213
214 result = tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 2); 214 result = tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 2);
215 msleep(20); 215 msleep(20);
@@ -218,7 +218,7 @@ static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state)
218 218
219static int tda1004x_disable_tuner_i2c(struct tda1004x_state *state) 219static int tda1004x_disable_tuner_i2c(struct tda1004x_state *state)
220{ 220{
221 dprintk("%s\n", __FUNCTION__); 221 dprintk("%s\n", __func__);
222 222
223 return tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 0); 223 return tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 0);
224} 224}
@@ -345,7 +345,7 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
345 } 345 }
346 pos += tx_size; 346 pos += tx_size;
347 347
348 dprintk("%s: fw_pos=0x%x\n", __FUNCTION__, pos); 348 dprintk("%s: fw_pos=0x%x\n", __func__, pos);
349 } 349 }
350 // give the DSP a chance to settle 03/10/05 Hac 350 // give the DSP a chance to settle 03/10/05 Hac
351 msleep(100); 351 msleep(100);
@@ -444,10 +444,10 @@ static void tda10046_init_plls(struct dvb_frontend* fe)
444 tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 0x03); // PLL M = 3 444 tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 0x03); // PLL M = 3
445 } 445 }
446 if (state->config->xtal_freq == TDA10046_XTAL_4M ) { 446 if (state->config->xtal_freq == TDA10046_XTAL_4M ) {
447 dprintk("%s: setting up PLLs for a 4 MHz Xtal\n", __FUNCTION__); 447 dprintk("%s: setting up PLLs for a 4 MHz Xtal\n", __func__);
448 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0 448 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0
449 } else { 449 } else {
450 dprintk("%s: setting up PLLs for a 16 MHz Xtal\n", __FUNCTION__); 450 dprintk("%s: setting up PLLs for a 16 MHz Xtal\n", __func__);
451 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 3); // PLL P = 0, N = 3 451 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 3); // PLL P = 0, N = 3
452 } 452 }
453 if(tda10046_clk53m) 453 if(tda10046_clk53m)
@@ -488,7 +488,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
488 if (state->config->xtal_freq == TDA10046_XTAL_4M) { 488 if (state->config->xtal_freq == TDA10046_XTAL_4M) {
489 tda1004x_write_byteI(state, TDA1004X_CONFC4, 0); 489 tda1004x_write_byteI(state, TDA1004X_CONFC4, 0);
490 } else { 490 } else {
491 dprintk("%s: 16MHz Xtal, reducing I2C speed\n", __FUNCTION__); 491 dprintk("%s: 16MHz Xtal, reducing I2C speed\n", __func__);
492 tda1004x_write_byteI(state, TDA1004X_CONFC4, 0x80); 492 tda1004x_write_byteI(state, TDA1004X_CONFC4, 0x80);
493 } 493 }
494 tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 1, 0); 494 tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 1, 0);
@@ -594,7 +594,7 @@ static int tda10045_init(struct dvb_frontend* fe)
594{ 594{
595 struct tda1004x_state* state = fe->demodulator_priv; 595 struct tda1004x_state* state = fe->demodulator_priv;
596 596
597 dprintk("%s\n", __FUNCTION__); 597 dprintk("%s\n", __func__);
598 598
599 if (tda10045_fwupload(fe)) { 599 if (tda10045_fwupload(fe)) {
600 printk("tda1004x: firmware upload failed\n"); 600 printk("tda1004x: firmware upload failed\n");
@@ -624,7 +624,7 @@ static int tda10045_init(struct dvb_frontend* fe)
624static int tda10046_init(struct dvb_frontend* fe) 624static int tda10046_init(struct dvb_frontend* fe)
625{ 625{
626 struct tda1004x_state* state = fe->demodulator_priv; 626 struct tda1004x_state* state = fe->demodulator_priv;
627 dprintk("%s\n", __FUNCTION__); 627 dprintk("%s\n", __func__);
628 628
629 if (tda10046_fwupload(fe)) { 629 if (tda10046_fwupload(fe)) {
630 printk("tda1004x: firmware upload failed\n"); 630 printk("tda1004x: firmware upload failed\n");
@@ -686,7 +686,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
686 int tmp; 686 int tmp;
687 int inversion; 687 int inversion;
688 688
689 dprintk("%s\n", __FUNCTION__); 689 dprintk("%s\n", __func__);
690 690
691 if (state->demod_type == TDA1004X_DEMOD_TDA10046) { 691 if (state->demod_type == TDA1004X_DEMOD_TDA10046) {
692 // setup auto offset 692 // setup auto offset
@@ -881,7 +881,7 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete
881{ 881{
882 struct tda1004x_state* state = fe->demodulator_priv; 882 struct tda1004x_state* state = fe->demodulator_priv;
883 883
884 dprintk("%s\n", __FUNCTION__); 884 dprintk("%s\n", __func__);
885 885
886 // inversion status 886 // inversion status
887 fe_params->inversion = INVERSION_OFF; 887 fe_params->inversion = INVERSION_OFF;
@@ -989,7 +989,7 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status
989 int cber; 989 int cber;
990 int vber; 990 int vber;
991 991
992 dprintk("%s\n", __FUNCTION__); 992 dprintk("%s\n", __func__);
993 993
994 // read status 994 // read status
995 status = tda1004x_read_byte(state, TDA1004X_STATUS_CD); 995 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 } 1048 }
1049 1049
1050 // success 1050 // success
1051 dprintk("%s: fe_status=0x%x\n", __FUNCTION__, *fe_status); 1051 dprintk("%s: fe_status=0x%x\n", __func__, *fe_status);
1052 return 0; 1052 return 0;
1053} 1053}
1054 1054
@@ -1058,7 +1058,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
1058 int tmp; 1058 int tmp;
1059 int reg = 0; 1059 int reg = 0;
1060 1060
1061 dprintk("%s\n", __FUNCTION__); 1061 dprintk("%s\n", __func__);
1062 1062
1063 // determine the register to use 1063 // determine the register to use
1064 switch (state->demod_type) { 1064 switch (state->demod_type) {
@@ -1077,7 +1077,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
1077 return -EIO; 1077 return -EIO;
1078 1078
1079 *signal = (tmp << 8) | tmp; 1079 *signal = (tmp << 8) | tmp;
1080 dprintk("%s: signal=0x%x\n", __FUNCTION__, *signal); 1080 dprintk("%s: signal=0x%x\n", __func__, *signal);
1081 return 0; 1081 return 0;
1082} 1082}
1083 1083
@@ -1086,7 +1086,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
1086 struct tda1004x_state* state = fe->demodulator_priv; 1086 struct tda1004x_state* state = fe->demodulator_priv;
1087 int tmp; 1087 int tmp;
1088 1088
1089 dprintk("%s\n", __FUNCTION__); 1089 dprintk("%s\n", __func__);
1090 1090
1091 // read it 1091 // read it
1092 tmp = tda1004x_read_byte(state, TDA1004X_SNR); 1092 tmp = tda1004x_read_byte(state, TDA1004X_SNR);
@@ -1095,7 +1095,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
1095 tmp = 255 - tmp; 1095 tmp = 255 - tmp;
1096 1096
1097 *snr = ((tmp << 8) | tmp); 1097 *snr = ((tmp << 8) | tmp);
1098 dprintk("%s: snr=0x%x\n", __FUNCTION__, *snr); 1098 dprintk("%s: snr=0x%x\n", __func__, *snr);
1099 return 0; 1099 return 0;
1100} 1100}
1101 1101
@@ -1106,7 +1106,7 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
1106 int tmp2; 1106 int tmp2;
1107 int counter; 1107 int counter;
1108 1108
1109 dprintk("%s\n", __FUNCTION__); 1109 dprintk("%s\n", __func__);
1110 1110
1111 // read the UCBLOCKS and reset 1111 // read the UCBLOCKS and reset
1112 counter = 0; 1112 counter = 0;
@@ -1132,7 +1132,7 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
1132 else 1132 else
1133 *ucblocks = 0xffffffff; 1133 *ucblocks = 0xffffffff;
1134 1134
1135 dprintk("%s: ucblocks=0x%x\n", __FUNCTION__, *ucblocks); 1135 dprintk("%s: ucblocks=0x%x\n", __func__, *ucblocks);
1136 return 0; 1136 return 0;
1137} 1137}
1138 1138
@@ -1141,7 +1141,7 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber)
1141 struct tda1004x_state* state = fe->demodulator_priv; 1141 struct tda1004x_state* state = fe->demodulator_priv;
1142 int tmp; 1142 int tmp;
1143 1143
1144 dprintk("%s\n", __FUNCTION__); 1144 dprintk("%s\n", __func__);
1145 1145
1146 // read it in 1146 // read it in
1147 tmp = tda1004x_read_byte(state, TDA1004X_CBER_LSB); 1147 tmp = tda1004x_read_byte(state, TDA1004X_CBER_LSB);
@@ -1155,7 +1155,7 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber)
1155 // The address 0x20 should be read to cope with a TDA10046 bug 1155 // The address 0x20 should be read to cope with a TDA10046 bug
1156 tda1004x_read_byte(state, TDA1004X_CBER_RESET); 1156 tda1004x_read_byte(state, TDA1004X_CBER_RESET);
1157 1157
1158 dprintk("%s: ber=0x%x\n", __FUNCTION__, *ber); 1158 dprintk("%s: ber=0x%x\n", __func__, *ber);
1159 return 0; 1159 return 0;
1160} 1160}
1161 1161
diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h
index ebb2c5f5a261..4e27ffb0f14e 100644
--- a/drivers/media/dvb/frontends/tda1004x.h
+++ b/drivers/media/dvb/frontends/tda1004x.h
@@ -127,13 +127,13 @@ extern struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config
127static inline struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config, 127static inline struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
128 struct i2c_adapter* i2c) 128 struct i2c_adapter* i2c)
129{ 129{
130 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 130 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
131 return NULL; 131 return NULL;
132} 132}
133static inline struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config, 133static inline struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
134 struct i2c_adapter* i2c) 134 struct i2c_adapter* i2c)
135{ 135{
136 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 136 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
137 return NULL; 137 return NULL;
138} 138}
139#endif // CONFIG_DVB_TDA1004X 139#endif // CONFIG_DVB_TDA1004X
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c
index 143af96439b9..5fc26757f393 100644
--- a/drivers/media/dvb/frontends/tda10086.c
+++ b/drivers/media/dvb/frontends/tda10086.c
@@ -60,7 +60,7 @@ static int tda10086_write_byte(struct tda10086_state *state, int reg, int data)
60 60
61 if (ret != 1) 61 if (ret != 1)
62 dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n", 62 dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
63 __FUNCTION__, reg, data, ret); 63 __func__, reg, data, ret);
64 64
65 return (ret != 1) ? ret : 0; 65 return (ret != 1) ? ret : 0;
66} 66}
@@ -78,7 +78,7 @@ static int tda10086_read_byte(struct tda10086_state *state, int reg)
78 ret = i2c_transfer(state->i2c, msg, 2); 78 ret = i2c_transfer(state->i2c, msg, 2);
79 79
80 if (ret != 2) { 80 if (ret != 2) {
81 dprintk("%s: error reg=0x%x, ret=%i\n", __FUNCTION__, reg, 81 dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg,
82 ret); 82 ret);
83 return ret; 83 return ret;
84 } 84 }
@@ -108,7 +108,7 @@ static int tda10086_init(struct dvb_frontend* fe)
108 struct tda10086_state* state = fe->demodulator_priv; 108 struct tda10086_state* state = fe->demodulator_priv;
109 u8 t22k_off = 0x80; 109 u8 t22k_off = 0x80;
110 110
111 dprintk ("%s\n", __FUNCTION__); 111 dprintk ("%s\n", __func__);
112 112
113 if (state->config->diseqc_tone) 113 if (state->config->diseqc_tone)
114 t22k_off = 0; 114 t22k_off = 0;
@@ -173,7 +173,7 @@ static void tda10086_diseqc_wait(struct tda10086_state *state)
173 unsigned long timeout = jiffies + msecs_to_jiffies(200); 173 unsigned long timeout = jiffies + msecs_to_jiffies(200);
174 while (!(tda10086_read_byte(state, 0x50) & 0x01)) { 174 while (!(tda10086_read_byte(state, 0x50) & 0x01)) {
175 if(time_after(jiffies, timeout)) { 175 if(time_after(jiffies, timeout)) {
176 printk("%s: diseqc queue not ready, command may be lost.\n", __FUNCTION__); 176 printk("%s: diseqc queue not ready, command may be lost.\n", __func__);
177 break; 177 break;
178 } 178 }
179 msleep(10); 179 msleep(10);
@@ -185,7 +185,7 @@ static int tda10086_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
185 struct tda10086_state* state = fe->demodulator_priv; 185 struct tda10086_state* state = fe->demodulator_priv;
186 u8 t22k_off = 0x80; 186 u8 t22k_off = 0x80;
187 187
188 dprintk ("%s\n", __FUNCTION__); 188 dprintk ("%s\n", __func__);
189 189
190 if (state->config->diseqc_tone) 190 if (state->config->diseqc_tone)
191 t22k_off = 0; 191 t22k_off = 0;
@@ -211,7 +211,7 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,
211 u8 oldval; 211 u8 oldval;
212 u8 t22k_off = 0x80; 212 u8 t22k_off = 0x80;
213 213
214 dprintk ("%s\n", __FUNCTION__); 214 dprintk ("%s\n", __func__);
215 215
216 if (state->config->diseqc_tone) 216 if (state->config->diseqc_tone)
217 t22k_off = 0; 217 t22k_off = 0;
@@ -239,7 +239,7 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic
239 u8 oldval = tda10086_read_byte(state, 0x36); 239 u8 oldval = tda10086_read_byte(state, 0x36);
240 u8 t22k_off = 0x80; 240 u8 t22k_off = 0x80;
241 241
242 dprintk ("%s\n", __FUNCTION__); 242 dprintk ("%s\n", __func__);
243 243
244 if (state->config->diseqc_tone) 244 if (state->config->diseqc_tone)
245 t22k_off = 0; 245 t22k_off = 0;
@@ -266,7 +266,7 @@ static int tda10086_set_inversion(struct tda10086_state *state,
266{ 266{
267 u8 invval = 0x80; 267 u8 invval = 0x80;
268 268
269 dprintk ("%s %i %i\n", __FUNCTION__, fe_params->inversion, state->config->invert); 269 dprintk ("%s %i %i\n", __func__, fe_params->inversion, state->config->invert);
270 270
271 switch(fe_params->inversion) { 271 switch(fe_params->inversion) {
272 case INVERSION_OFF: 272 case INVERSION_OFF:
@@ -300,7 +300,7 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state,
300 u32 bdri; 300 u32 bdri;
301 u32 symbol_rate = fe_params->u.qpsk.symbol_rate; 301 u32 symbol_rate = fe_params->u.qpsk.symbol_rate;
302 302
303 dprintk ("%s %i\n", __FUNCTION__, symbol_rate); 303 dprintk ("%s %i\n", __func__, symbol_rate);
304 304
305 // setup the decimation and anti-aliasing filters.. 305 // setup the decimation and anti-aliasing filters..
306 if (symbol_rate < (u32) (SACLK * 0.0137)) { 306 if (symbol_rate < (u32) (SACLK * 0.0137)) {
@@ -366,7 +366,7 @@ static int tda10086_set_fec(struct tda10086_state *state,
366{ 366{
367 u8 fecval; 367 u8 fecval;
368 368
369 dprintk ("%s %i\n", __FUNCTION__, fe_params->u.qpsk.fec_inner); 369 dprintk ("%s %i\n", __func__, fe_params->u.qpsk.fec_inner);
370 370
371 switch(fe_params->u.qpsk.fec_inner) { 371 switch(fe_params->u.qpsk.fec_inner) {
372 case FEC_1_2: 372 case FEC_1_2:
@@ -412,7 +412,7 @@ static int tda10086_set_frontend(struct dvb_frontend* fe,
412 u32 freq = 0; 412 u32 freq = 0;
413 int freqoff; 413 int freqoff;
414 414
415 dprintk ("%s\n", __FUNCTION__); 415 dprintk ("%s\n", __func__);
416 416
417 // modify parameters for tuning 417 // modify parameters for tuning
418 tda10086_write_byte(state, 0x02, 0x35); 418 tda10086_write_byte(state, 0x02, 0x35);
@@ -459,7 +459,7 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
459 int tmp; 459 int tmp;
460 u64 tmp64; 460 u64 tmp64;
461 461
462 dprintk ("%s\n", __FUNCTION__); 462 dprintk ("%s\n", __func__);
463 463
464 // check for invalid symbol rate 464 // check for invalid symbol rate
465 if (fe_params->u.qpsk.symbol_rate < 500000) 465 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 struct tda10086_state* state = fe->demodulator_priv; 550 struct tda10086_state* state = fe->demodulator_priv;
551 u8 val; 551 u8 val;
552 552
553 dprintk ("%s\n", __FUNCTION__); 553 dprintk ("%s\n", __func__);
554 554
555 val = tda10086_read_byte(state, 0x0e); 555 val = tda10086_read_byte(state, 0x0e);
556 *fe_status = 0; 556 *fe_status = 0;
@@ -579,7 +579,7 @@ static int tda10086_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
579 struct tda10086_state* state = fe->demodulator_priv; 579 struct tda10086_state* state = fe->demodulator_priv;
580 u8 _str; 580 u8 _str;
581 581
582 dprintk ("%s\n", __FUNCTION__); 582 dprintk ("%s\n", __func__);
583 583
584 _str = 0xff - tda10086_read_byte(state, 0x43); 584 _str = 0xff - tda10086_read_byte(state, 0x43);
585 *signal = (_str << 8) | _str; 585 *signal = (_str << 8) | _str;
@@ -592,7 +592,7 @@ static int tda10086_read_snr(struct dvb_frontend* fe, u16 * snr)
592 struct tda10086_state* state = fe->demodulator_priv; 592 struct tda10086_state* state = fe->demodulator_priv;
593 u8 _snr; 593 u8 _snr;
594 594
595 dprintk ("%s\n", __FUNCTION__); 595 dprintk ("%s\n", __func__);
596 596
597 _snr = 0xff - tda10086_read_byte(state, 0x1c); 597 _snr = 0xff - tda10086_read_byte(state, 0x1c);
598 *snr = (_snr << 8) | _snr; 598 *snr = (_snr << 8) | _snr;
@@ -604,7 +604,7 @@ static int tda10086_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
604{ 604{
605 struct tda10086_state* state = fe->demodulator_priv; 605 struct tda10086_state* state = fe->demodulator_priv;
606 606
607 dprintk ("%s\n", __FUNCTION__); 607 dprintk ("%s\n", __func__);
608 608
609 // read it 609 // read it
610 *ucblocks = tda10086_read_byte(state, 0x18) & 0x7f; 610 *ucblocks = tda10086_read_byte(state, 0x18) & 0x7f;
@@ -620,7 +620,7 @@ static int tda10086_read_ber(struct dvb_frontend* fe, u32* ber)
620{ 620{
621 struct tda10086_state* state = fe->demodulator_priv; 621 struct tda10086_state* state = fe->demodulator_priv;
622 622
623 dprintk ("%s\n", __FUNCTION__); 623 dprintk ("%s\n", __func__);
624 624
625 // read it 625 // read it
626 *ber = 0; 626 *ber = 0;
@@ -635,7 +635,7 @@ static int tda10086_sleep(struct dvb_frontend* fe)
635{ 635{
636 struct tda10086_state* state = fe->demodulator_priv; 636 struct tda10086_state* state = fe->demodulator_priv;
637 637
638 dprintk ("%s\n", __FUNCTION__); 638 dprintk ("%s\n", __func__);
639 639
640 tda10086_write_mask(state, 0x00, 0x08, 0x08); 640 tda10086_write_mask(state, 0x00, 0x08, 0x08);
641 641
@@ -646,7 +646,7 @@ static int tda10086_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
646{ 646{
647 struct tda10086_state* state = fe->demodulator_priv; 647 struct tda10086_state* state = fe->demodulator_priv;
648 648
649 dprintk ("%s\n", __FUNCTION__); 649 dprintk ("%s\n", __func__);
650 650
651 if (enable) { 651 if (enable) {
652 tda10086_write_mask(state, 0x00, 0x10, 0x10); 652 tda10086_write_mask(state, 0x00, 0x10, 0x10);
@@ -737,7 +737,7 @@ struct dvb_frontend* tda10086_attach(const struct tda10086_config* config,
737{ 737{
738 struct tda10086_state *state; 738 struct tda10086_state *state;
739 739
740 dprintk ("%s\n", __FUNCTION__); 740 dprintk ("%s\n", __func__);
741 741
742 /* allocate memory for the internal state */ 742 /* allocate memory for the internal state */
743 state = kmalloc(sizeof(struct tda10086_state), GFP_KERNEL); 743 state = kmalloc(sizeof(struct tda10086_state), GFP_KERNEL);
diff --git a/drivers/media/dvb/frontends/tda10086.h b/drivers/media/dvb/frontends/tda10086.h
index eeceaeee78ff..197c237e515f 100644
--- a/drivers/media/dvb/frontends/tda10086.h
+++ b/drivers/media/dvb/frontends/tda10086.h
@@ -45,7 +45,7 @@ extern struct dvb_frontend* tda10086_attach(const struct tda10086_config* config
45static inline struct dvb_frontend* tda10086_attach(const struct tda10086_config* config, 45static inline struct dvb_frontend* tda10086_attach(const struct tda10086_config* config,
46 struct i2c_adapter* i2c) 46 struct i2c_adapter* i2c)
47{ 47{
48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
49 return NULL; 49 return NULL;
50} 50}
51#endif // CONFIG_DVB_TDA10086 51#endif // CONFIG_DVB_TDA10086
diff --git a/drivers/media/dvb/frontends/tda18271-priv.h b/drivers/media/dvb/frontends/tda18271-priv.h
index 4b153bc557fe..2bc5eb368ea2 100644
--- a/drivers/media/dvb/frontends/tda18271-priv.h
+++ b/drivers/media/dvb/frontends/tda18271-priv.h
@@ -139,7 +139,7 @@ extern int tda18271_debug;
139#define DBG_CAL 16 139#define DBG_CAL 16
140 140
141#define tda_printk(kern, fmt, arg...) \ 141#define tda_printk(kern, fmt, arg...) \
142 printk(kern "%s: " fmt, __FUNCTION__, ##arg) 142 printk(kern "%s: " fmt, __func__, ##arg)
143 143
144#define dprintk(kern, lvl, fmt, arg...) do {\ 144#define dprintk(kern, lvl, fmt, arg...) do {\
145 if (tda18271_debug & lvl) \ 145 if (tda18271_debug & lvl) \
diff --git a/drivers/media/dvb/frontends/tda18271.h b/drivers/media/dvb/frontends/tda18271.h
index b547318c951b..0e7af8d05a38 100644
--- a/drivers/media/dvb/frontends/tda18271.h
+++ b/drivers/media/dvb/frontends/tda18271.h
@@ -91,7 +91,7 @@ static inline struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe,
91 struct i2c_adapter *i2c, 91 struct i2c_adapter *i2c,
92 struct tda18271_config *cfg) 92 struct tda18271_config *cfg)
93{ 93{
94 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 94 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
95 return NULL; 95 return NULL;
96} 96}
97#endif 97#endif
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index 011b74f798a0..5b843b2e67e8 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -68,7 +68,7 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data)
68 68
69 if (ret != 1) 69 if (ret != 1)
70 dprintk ("%s: writereg error (reg %02x, ret == %i)\n", 70 dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
71 __FUNCTION__, reg, ret); 71 __func__, reg, ret);
72 72
73 return (ret != 1) ? -1 : 0; 73 return (ret != 1) ? -1 : 0;
74} 74}
@@ -83,7 +83,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len
83 83
84 if (ret != 2) 84 if (ret != 2)
85 dprintk ("%s: readreg error (reg %02x, ret == %i)\n", 85 dprintk ("%s: readreg error (reg %02x, ret == %i)\n",
86 __FUNCTION__, reg1, ret); 86 __func__, reg1, ret);
87 87
88 return ret == 2 ? 0 : -1; 88 return ret == 2 ? 0 : -1;
89} 89}
diff --git a/drivers/media/dvb/frontends/tda8083.h b/drivers/media/dvb/frontends/tda8083.h
index 2d3307999f21..5a03c14a10e8 100644
--- a/drivers/media/dvb/frontends/tda8083.h
+++ b/drivers/media/dvb/frontends/tda8083.h
@@ -42,7 +42,7 @@ extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
42static inline struct dvb_frontend* tda8083_attach(const struct tda8083_config* config, 42static inline struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
43 struct i2c_adapter* i2c) 43 struct i2c_adapter* i2c)
44{ 44{
45 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 45 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
46 return NULL; 46 return NULL;
47} 47}
48#endif // CONFIG_DVB_TDA8083 48#endif // CONFIG_DVB_TDA8083
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c
index 9a91eb0333d9..5a15bb4263fb 100644
--- a/drivers/media/dvb/frontends/tda826x.c
+++ b/drivers/media/dvb/frontends/tda826x.c
@@ -54,7 +54,7 @@ static int tda826x_sleep(struct dvb_frontend *fe)
54 u8 buf [] = { 0x00, 0x8d }; 54 u8 buf [] = { 0x00, 0x8d };
55 struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 2 }; 55 struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 2 };
56 56
57 dprintk("%s:\n", __FUNCTION__); 57 dprintk("%s:\n", __func__);
58 58
59 if (!priv->has_loopthrough) 59 if (!priv->has_loopthrough)
60 buf[1] = 0xad; 60 buf[1] = 0xad;
@@ -62,7 +62,7 @@ static int tda826x_sleep(struct dvb_frontend *fe)
62 if (fe->ops.i2c_gate_ctrl) 62 if (fe->ops.i2c_gate_ctrl)
63 fe->ops.i2c_gate_ctrl(fe, 1); 63 fe->ops.i2c_gate_ctrl(fe, 1);
64 if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) { 64 if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) {
65 dprintk("%s: i2c error\n", __FUNCTION__); 65 dprintk("%s: i2c error\n", __func__);
66 } 66 }
67 if (fe->ops.i2c_gate_ctrl) 67 if (fe->ops.i2c_gate_ctrl)
68 fe->ops.i2c_gate_ctrl(fe, 0); 68 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 u8 buf [11]; 78 u8 buf [11];
79 struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 11 }; 79 struct i2c_msg msg = { .addr = priv->i2c_address, .flags = 0, .buf = buf, .len = 11 };
80 80
81 dprintk("%s:\n", __FUNCTION__); 81 dprintk("%s:\n", __func__);
82 82
83 div = (params->frequency + (1000-1)) / 1000; 83 div = (params->frequency + (1000-1)) / 1000;
84 84
@@ -99,7 +99,7 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param
99 if (fe->ops.i2c_gate_ctrl) 99 if (fe->ops.i2c_gate_ctrl)
100 fe->ops.i2c_gate_ctrl(fe, 1); 100 fe->ops.i2c_gate_ctrl(fe, 1);
101 if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) { 101 if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) {
102 dprintk("%s: i2c error\n", __FUNCTION__); 102 dprintk("%s: i2c error\n", __func__);
103 } 103 }
104 if (fe->ops.i2c_gate_ctrl) 104 if (fe->ops.i2c_gate_ctrl)
105 fe->ops.i2c_gate_ctrl(fe, 0); 105 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 }; 138 };
139 int ret; 139 int ret;
140 140
141 dprintk("%s:\n", __FUNCTION__); 141 dprintk("%s:\n", __func__);
142 142
143 if (fe->ops.i2c_gate_ctrl) 143 if (fe->ops.i2c_gate_ctrl)
144 fe->ops.i2c_gate_ctrl(fe, 1); 144 fe->ops.i2c_gate_ctrl(fe, 1);
diff --git a/drivers/media/dvb/frontends/tda826x.h b/drivers/media/dvb/frontends/tda826x.h
index ad9981195961..89e97926ab23 100644
--- a/drivers/media/dvb/frontends/tda826x.h
+++ b/drivers/media/dvb/frontends/tda826x.h
@@ -45,7 +45,7 @@ static inline struct dvb_frontend* tda826x_attach(struct dvb_frontend *fe,
45 struct i2c_adapter *i2c, 45 struct i2c_adapter *i2c,
46 int has_loopthrough) 46 int has_loopthrough)
47{ 47{
48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 48 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
49 return NULL; 49 return NULL;
50} 50}
51#endif // CONFIG_DVB_TDA826X 51#endif // CONFIG_DVB_TDA826X
diff --git a/drivers/media/dvb/frontends/tda827x.h b/drivers/media/dvb/frontends/tda827x.h
index cd3032f985cd..b73c23570dab 100644
--- a/drivers/media/dvb/frontends/tda827x.h
+++ b/drivers/media/dvb/frontends/tda827x.h
@@ -61,7 +61,7 @@ static inline struct dvb_frontend* tda827x_attach(struct dvb_frontend *fe,
61 struct i2c_adapter *i2c, 61 struct i2c_adapter *i2c,
62 struct tda827x_config *cfg) 62 struct tda827x_config *cfg)
63{ 63{
64 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 64 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
65 return NULL; 65 return NULL;
66} 66}
67#endif // CONFIG_DVB_TDA827X 67#endif // CONFIG_DVB_TDA827X
diff --git a/drivers/media/dvb/frontends/tua6100.c b/drivers/media/dvb/frontends/tua6100.c
index 6ba0029dcf2e..1790baee014c 100644
--- a/drivers/media/dvb/frontends/tua6100.c
+++ b/drivers/media/dvb/frontends/tua6100.c
@@ -58,7 +58,7 @@ static int tua6100_sleep(struct dvb_frontend *fe)
58 if (fe->ops.i2c_gate_ctrl) 58 if (fe->ops.i2c_gate_ctrl)
59 fe->ops.i2c_gate_ctrl(fe, 1); 59 fe->ops.i2c_gate_ctrl(fe, 1);
60 if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) { 60 if ((ret = i2c_transfer (priv->i2c, &msg, 1)) != 1) {
61 printk("%s: i2c error\n", __FUNCTION__); 61 printk("%s: i2c error\n", __func__);
62 } 62 }
63 if (fe->ops.i2c_gate_ctrl) 63 if (fe->ops.i2c_gate_ctrl)
64 fe->ops.i2c_gate_ctrl(fe, 0); 64 fe->ops.i2c_gate_ctrl(fe, 0);
diff --git a/drivers/media/dvb/frontends/tua6100.h b/drivers/media/dvb/frontends/tua6100.h
index 03a665e7df6d..f83dbd5e42ae 100644
--- a/drivers/media/dvb/frontends/tua6100.h
+++ b/drivers/media/dvb/frontends/tua6100.h
@@ -39,7 +39,7 @@ extern struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, st
39#else 39#else
40static inline struct dvb_frontend* tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c) 40static inline struct dvb_frontend* tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c)
41{ 41{
42 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 42 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
43 return NULL; 43 return NULL;
44} 44}
45#endif // CONFIG_DVB_TUA6100 45#endif // CONFIG_DVB_TUA6100
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 8791701c8f25..a184597f1d9b 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -66,7 +66,7 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
66 66
67 if (ret != 1) 67 if (ret != 1)
68 printk("ves1820: %s(): writereg error (reg == 0x%02x, " 68 printk("ves1820: %s(): writereg error (reg == 0x%02x, "
69 "val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret); 69 "val == 0x%02x, ret == %i)\n", __func__, reg, data, ret);
70 70
71 return (ret != 1) ? -EREMOTEIO : 0; 71 return (ret != 1) ? -EREMOTEIO : 0;
72} 72}
@@ -85,7 +85,7 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
85 85
86 if (ret != 2) 86 if (ret != 2)
87 printk("ves1820: %s(): readreg error (reg == 0x%02x, " 87 printk("ves1820: %s(): readreg error (reg == 0x%02x, "
88 "ret == %i)\n", __FUNCTION__, reg, ret); 88 "ret == %i)\n", __func__, reg, ret);
89 89
90 return b1[0]; 90 return b1[0];
91} 91}
diff --git a/drivers/media/dvb/frontends/ves1820.h b/drivers/media/dvb/frontends/ves1820.h
index e4a2a324046a..e902ed634ec3 100644
--- a/drivers/media/dvb/frontends/ves1820.h
+++ b/drivers/media/dvb/frontends/ves1820.h
@@ -48,7 +48,7 @@ extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
48static inline struct dvb_frontend* ves1820_attach(const struct ves1820_config* config, 48static inline struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
49 struct i2c_adapter* i2c, u8 pwm) 49 struct i2c_adapter* i2c, u8 pwm)
50{ 50{
51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 51 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
52 return NULL; 52 return NULL;
53} 53}
54#endif // CONFIG_DVB_VES1820 54#endif // CONFIG_DVB_VES1820
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index c041c81f9686..bd558960bd87 100644
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -98,7 +98,7 @@ static int ves1x93_writereg (struct ves1x93_state* state, u8 reg, u8 data)
98 int err; 98 int err;
99 99
100 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 100 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
101 dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); 101 dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
102 return -EREMOTEIO; 102 return -EREMOTEIO;
103 } 103 }
104 104
@@ -179,7 +179,7 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
179 u32 tmp; 179 u32 tmp;
180 u32 FIN; 180 u32 FIN;
181 181
182 dprintk("%s: srate == %d\n", __FUNCTION__, (unsigned int) srate); 182 dprintk("%s: srate == %d\n", __func__, (unsigned int) srate);
183 183
184 if (srate > state->config->xin/2) 184 if (srate > state->config->xin/2)
185 srate = state->config->xin/2; 185 srate = state->config->xin/2;
@@ -266,7 +266,7 @@ static int ves1x93_init (struct dvb_frontend* fe)
266 int i; 266 int i;
267 int val; 267 int val;
268 268
269 dprintk("%s: init chip\n", __FUNCTION__); 269 dprintk("%s: init chip\n", __func__);
270 270
271 for (i = 0; i < state->tab_size; i++) { 271 for (i = 0; i < state->tab_size; i++) {
272 if (state->init_1x93_wtab[i]) { 272 if (state->init_1x93_wtab[i]) {
diff --git a/drivers/media/dvb/frontends/ves1x93.h b/drivers/media/dvb/frontends/ves1x93.h
index d507f8966f81..8a5a49e808f6 100644
--- a/drivers/media/dvb/frontends/ves1x93.h
+++ b/drivers/media/dvb/frontends/ves1x93.h
@@ -47,7 +47,7 @@ extern struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
47static inline struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config, 47static inline struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
48 struct i2c_adapter* i2c) 48 struct i2c_adapter* i2c)
49{ 49{
50 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 50 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
51 return NULL; 51 return NULL;
52} 52}
53#endif // CONFIG_DVB_VES1X93 53#endif // CONFIG_DVB_VES1X93
diff --git a/drivers/media/dvb/frontends/xc5000.c b/drivers/media/dvb/frontends/xc5000.c
index a5094b7f21fd..43d35bdb221f 100644
--- a/drivers/media/dvb/frontends/xc5000.c
+++ b/drivers/media/dvb/frontends/xc5000.c
@@ -209,7 +209,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
209 struct xc5000_priv *priv = fe->tuner_priv; 209 struct xc5000_priv *priv = fe->tuner_priv;
210 int ret; 210 int ret;
211 211
212 dprintk(1, "%s()\n", __FUNCTION__); 212 dprintk(1, "%s()\n", __func__);
213 213
214 if (priv->cfg->tuner_callback) { 214 if (priv->cfg->tuner_callback) {
215 ret = priv->cfg->tuner_callback(priv->cfg->priv, 215 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 330
331static int xc_initialize(struct xc5000_priv *priv) 331static int xc_initialize(struct xc5000_priv *priv)
332{ 332{
333 dprintk(1, "%s()\n", __FUNCTION__); 333 dprintk(1, "%s()\n", __func__);
334 return xc_write_reg(priv, XREG_INIT, 0); 334 return xc_write_reg(priv, XREG_INIT, 0);
335} 335}
336 336
@@ -338,9 +338,9 @@ static int xc_SetTVStandard(struct xc5000_priv *priv,
338 u16 VideoMode, u16 AudioMode) 338 u16 VideoMode, u16 AudioMode)
339{ 339{
340 int ret; 340 int ret;
341 dprintk(1, "%s(0x%04x,0x%04x)\n", __FUNCTION__, VideoMode, AudioMode); 341 dprintk(1, "%s(0x%04x,0x%04x)\n", __func__, VideoMode, AudioMode);
342 dprintk(1, "%s() Standard = %s\n", 342 dprintk(1, "%s() Standard = %s\n",
343 __FUNCTION__, 343 __func__,
344 XC5000_Standard[priv->video_standard].Name); 344 XC5000_Standard[priv->video_standard].Name);
345 345
346 ret = xc_write_reg(priv, XREG_VIDEO_MODE, VideoMode); 346 ret = xc_write_reg(priv, XREG_VIDEO_MODE, VideoMode);
@@ -361,7 +361,7 @@ static int xc_shutdown(struct xc5000_priv *priv)
361 361
362static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode) 362static int xc_SetSignalSource(struct xc5000_priv *priv, u16 rf_mode)
363{ 363{
364 dprintk(1, "%s(%d) Source = %s\n", __FUNCTION__, rf_mode, 364 dprintk(1, "%s(%d) Source = %s\n", __func__, rf_mode,
365 rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE"); 365 rf_mode == XC_RF_MODE_AIR ? "ANTENNA" : "CABLE");
366 366
367 if ((rf_mode != XC_RF_MODE_AIR) && (rf_mode != XC_RF_MODE_CABLE)) 367 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 rf_mode = XC_RF_MODE_CABLE; 369 rf_mode = XC_RF_MODE_CABLE;
370 printk(KERN_ERR 370 printk(KERN_ERR
371 "%s(), Invalid mode, defaulting to CABLE", 371 "%s(), Invalid mode, defaulting to CABLE",
372 __FUNCTION__); 372 __func__);
373 } 373 }
374 return xc_write_reg(priv, XREG_SIGNALSOURCE, rf_mode); 374 return xc_write_reg(priv, XREG_SIGNALSOURCE, rf_mode);
375} 375}
@@ -380,7 +380,7 @@ static int xc_set_RF_frequency(struct xc5000_priv *priv, u32 freq_hz)
380{ 380{
381 u16 freq_code; 381 u16 freq_code;
382 382
383 dprintk(1, "%s(%u)\n", __FUNCTION__, freq_hz); 383 dprintk(1, "%s(%u)\n", __func__, freq_hz);
384 384
385 if ((freq_hz > xc5000_tuner_ops.info.frequency_max) || 385 if ((freq_hz > xc5000_tuner_ops.info.frequency_max) ||
386 (freq_hz < xc5000_tuner_ops.info.frequency_min)) 386 (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{ 396{
397 u32 freq_code = (freq_khz * 1024)/1000; 397 u32 freq_code = (freq_khz * 1024)/1000;
398 dprintk(1, "%s(freq_khz = %d) freq_code = 0x%x\n", 398 dprintk(1, "%s(freq_khz = %d) freq_code = 0x%x\n",
399 __FUNCTION__, freq_khz, freq_code); 399 __func__, freq_khz, freq_code);
400 400
401 return xc_write_reg(priv, XREG_IF_OUT, freq_code); 401 return xc_write_reg(priv, XREG_IF_OUT, freq_code);
402} 402}
@@ -488,7 +488,7 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz)
488{ 488{
489 int found = 0; 489 int found = 0;
490 490
491 dprintk(1, "%s(%u)\n", __FUNCTION__, freq_hz); 491 dprintk(1, "%s(%u)\n", __func__, freq_hz);
492 492
493 if (xc_set_RF_frequency(priv, freq_hz) != XC_RESULT_SUCCESS) 493 if (xc_set_RF_frequency(priv, freq_hz) != XC_RESULT_SUCCESS)
494 return 0; 494 return 0;
@@ -627,12 +627,12 @@ static int xc5000_set_params(struct dvb_frontend *fe,
627 struct xc5000_priv *priv = fe->tuner_priv; 627 struct xc5000_priv *priv = fe->tuner_priv;
628 int ret; 628 int ret;
629 629
630 dprintk(1, "%s() frequency=%d (Hz)\n", __FUNCTION__, params->frequency); 630 dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency);
631 631
632 switch(params->u.vsb.modulation) { 632 switch(params->u.vsb.modulation) {
633 case VSB_8: 633 case VSB_8:
634 case VSB_16: 634 case VSB_16:
635 dprintk(1, "%s() VSB modulation\n", __FUNCTION__); 635 dprintk(1, "%s() VSB modulation\n", __func__);
636 priv->rf_mode = XC_RF_MODE_AIR; 636 priv->rf_mode = XC_RF_MODE_AIR;
637 priv->freq_hz = params->frequency - 1750000; 637 priv->freq_hz = params->frequency - 1750000;
638 priv->bandwidth = BANDWIDTH_6_MHZ; 638 priv->bandwidth = BANDWIDTH_6_MHZ;
@@ -641,7 +641,7 @@ static int xc5000_set_params(struct dvb_frontend *fe,
641 case QAM_64: 641 case QAM_64:
642 case QAM_256: 642 case QAM_256:
643 case QAM_AUTO: 643 case QAM_AUTO:
644 dprintk(1, "%s() QAM modulation\n", __FUNCTION__); 644 dprintk(1, "%s() QAM modulation\n", __func__);
645 priv->rf_mode = XC_RF_MODE_CABLE; 645 priv->rf_mode = XC_RF_MODE_CABLE;
646 priv->freq_hz = params->frequency - 1750000; 646 priv->freq_hz = params->frequency - 1750000;
647 priv->bandwidth = BANDWIDTH_6_MHZ; 647 priv->bandwidth = BANDWIDTH_6_MHZ;
@@ -652,7 +652,7 @@ static int xc5000_set_params(struct dvb_frontend *fe,
652 } 652 }
653 653
654 dprintk(1, "%s() frequency=%d (compensated)\n", 654 dprintk(1, "%s() frequency=%d (compensated)\n",
655 __FUNCTION__, priv->freq_hz); 655 __func__, priv->freq_hz);
656 656
657 ret = xc_SetSignalSource(priv, priv->rf_mode); 657 ret = xc_SetSignalSource(priv, priv->rf_mode);
658 if (ret != XC_RESULT_SUCCESS) { 658 if (ret != XC_RESULT_SUCCESS) {
@@ -697,7 +697,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,
697 xc_load_fw_and_init_tuner(fe); 697 xc_load_fw_and_init_tuner(fe);
698 698
699 dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n", 699 dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n",
700 __FUNCTION__, params->frequency); 700 __func__, params->frequency);
701 701
702 priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */ 702 priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */
703 703
@@ -775,7 +775,7 @@ tune_channel:
775static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) 775static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq)
776{ 776{
777 struct xc5000_priv *priv = fe->tuner_priv; 777 struct xc5000_priv *priv = fe->tuner_priv;
778 dprintk(1, "%s()\n", __FUNCTION__); 778 dprintk(1, "%s()\n", __func__);
779 *freq = priv->freq_hz; 779 *freq = priv->freq_hz;
780 return 0; 780 return 0;
781} 781}
@@ -783,7 +783,7 @@ static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq)
783static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw) 783static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw)
784{ 784{
785 struct xc5000_priv *priv = fe->tuner_priv; 785 struct xc5000_priv *priv = fe->tuner_priv;
786 dprintk(1, "%s()\n", __FUNCTION__); 786 dprintk(1, "%s()\n", __func__);
787 787
788 *bw = priv->bandwidth; 788 *bw = priv->bandwidth;
789 return 0; 789 return 0;
@@ -796,7 +796,7 @@ static int xc5000_get_status(struct dvb_frontend *fe, u32 *status)
796 796
797 xc_get_lock_status(priv, &lock_status); 797 xc_get_lock_status(priv, &lock_status);
798 798
799 dprintk(1, "%s() lock_status = 0x%08x\n", __FUNCTION__, lock_status); 799 dprintk(1, "%s() lock_status = 0x%08x\n", __func__, lock_status);
800 800
801 *status = lock_status; 801 *status = lock_status;
802 802
@@ -836,7 +836,7 @@ static int xc5000_sleep(struct dvb_frontend *fe)
836 struct xc5000_priv *priv = fe->tuner_priv; 836 struct xc5000_priv *priv = fe->tuner_priv;
837 int ret; 837 int ret;
838 838
839 dprintk(1, "%s()\n", __FUNCTION__); 839 dprintk(1, "%s()\n", __func__);
840 840
841 /* On Pinnacle PCTV HD 800i, the tuner cannot be reinitialized 841 /* On Pinnacle PCTV HD 800i, the tuner cannot be reinitialized
842 * once shutdown without reloading the driver. Maybe I am not 842 * once shutdown without reloading the driver. Maybe I am not
@@ -848,7 +848,7 @@ static int xc5000_sleep(struct dvb_frontend *fe)
848 if(ret != XC_RESULT_SUCCESS) { 848 if(ret != XC_RESULT_SUCCESS) {
849 printk(KERN_ERR 849 printk(KERN_ERR
850 "xc5000: %s() unable to shutdown tuner\n", 850 "xc5000: %s() unable to shutdown tuner\n",
851 __FUNCTION__); 851 __func__);
852 return -EREMOTEIO; 852 return -EREMOTEIO;
853 } 853 }
854 else { 854 else {
@@ -860,7 +860,7 @@ static int xc5000_sleep(struct dvb_frontend *fe)
860static int xc5000_init(struct dvb_frontend *fe) 860static int xc5000_init(struct dvb_frontend *fe)
861{ 861{
862 struct xc5000_priv *priv = fe->tuner_priv; 862 struct xc5000_priv *priv = fe->tuner_priv;
863 dprintk(1, "%s()\n", __FUNCTION__); 863 dprintk(1, "%s()\n", __func__);
864 864
865 if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) { 865 if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) {
866 printk(KERN_ERR "xc5000: Unable to initialise tuner\n"); 866 printk(KERN_ERR "xc5000: Unable to initialise tuner\n");
@@ -875,7 +875,7 @@ static int xc5000_init(struct dvb_frontend *fe)
875 875
876static int xc5000_release(struct dvb_frontend *fe) 876static int xc5000_release(struct dvb_frontend *fe)
877{ 877{
878 dprintk(1, "%s()\n", __FUNCTION__); 878 dprintk(1, "%s()\n", __func__);
879 kfree(fe->tuner_priv); 879 kfree(fe->tuner_priv);
880 fe->tuner_priv = NULL; 880 fe->tuner_priv = NULL;
881 return 0; 881 return 0;
@@ -907,7 +907,7 @@ struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe,
907 struct xc5000_priv *priv = NULL; 907 struct xc5000_priv *priv = NULL;
908 u16 id = 0; 908 u16 id = 0;
909 909
910 dprintk(1, "%s()\n", __FUNCTION__); 910 dprintk(1, "%s()\n", __func__);
911 911
912 priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL); 912 priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL);
913 if (priv == NULL) 913 if (priv == NULL)
diff --git a/drivers/media/dvb/frontends/xc5000.h b/drivers/media/dvb/frontends/xc5000.h
index 32a5f1c86a16..b890883a0cdc 100644
--- a/drivers/media/dvb/frontends/xc5000.h
+++ b/drivers/media/dvb/frontends/xc5000.h
@@ -55,7 +55,7 @@ static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
55 struct i2c_adapter *i2c, 55 struct i2c_adapter *i2c,
56 struct xc5000_config *cfg) 56 struct xc5000_config *cfg)
57{ 57{
58 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 58 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
59 return NULL; 59 return NULL;
60} 60}
61#endif // CONFIG_DVB_TUNER_XC5000 61#endif // CONFIG_DVB_TUNER_XC5000
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 3d508ff4b292..36a5a1c101d5 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -88,7 +88,7 @@ static int zl10353_read_register(struct zl10353_state *state, u8 reg)
88 88
89 if (ret != 2) { 89 if (ret != 2) {
90 printk("%s: readreg error (reg=%d, ret==%i)\n", 90 printk("%s: readreg error (reg=%d, ret==%i)\n",
91 __FUNCTION__, reg, ret); 91 __func__, reg, ret);
92 return ret; 92 return ret;
93 } 93 }
94 94
@@ -152,7 +152,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
152 *nominal_rate = value; 152 *nominal_rate = value;
153 153
154 dprintk("%s: bw %d, adc_clock %d => 0x%x\n", 154 dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
155 __FUNCTION__, bw, adc_clock, *nominal_rate); 155 __func__, bw, adc_clock, *nominal_rate);
156} 156}
157 157
158static void zl10353_calc_input_freq(struct dvb_frontend *fe, 158static void zl10353_calc_input_freq(struct dvb_frontend *fe,
@@ -181,7 +181,7 @@ static void zl10353_calc_input_freq(struct dvb_frontend *fe,
181 *input_freq = -value; 181 *input_freq = -value;
182 182
183 dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n", 183 dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n",
184 __FUNCTION__, if2, ife, adc_clock, -(int)value, *input_freq); 184 __func__, if2, ife, adc_clock, -(int)value, *input_freq);
185} 185}
186 186
187static int zl10353_sleep(struct dvb_frontend *fe) 187static int zl10353_sleep(struct dvb_frontend *fe)
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index fc734c22b5fa..fdbb88ff75fe 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -47,7 +47,7 @@ extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
47static inline struct dvb_frontend* zl10353_attach(const struct zl10353_config *config, 47static inline struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
48 struct i2c_adapter *i2c) 48 struct i2c_adapter *i2c)
49{ 49{
50 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); 50 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
51 return NULL; 51 return NULL;
52} 52}
53#endif /* CONFIG_DVB_ZL10353 */ 53#endif /* CONFIG_DVB_ZL10353 */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-29 22:23:03 -0500