aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/cx22702.c
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/dvb/frontends/cx22702.c
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/dvb/frontends/cx22702.c')
-rw-r--r--drivers/media/dvb/frontends/cx22702.c24
1 files changed, 12 insertions, 12 deletions
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;