aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c6
-rw-r--r--drivers/media/dvb/dvb-usb/gp8psk-fe.c4
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c12
-rw-r--r--drivers/media/dvb/dvb-usb/vp702x-fe.c18
4 files changed, 20 insertions, 20 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index b75b2b7a1330..4e5118dfe2e0 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -492,14 +492,14 @@ static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)
492 492
493 switch (command) { 493 switch (command) {
494 case XC2028_TUNER_RESET: 494 case XC2028_TUNER_RESET:
495 deb_info("%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg); 495 deb_info("%s: XC2028_TUNER_RESET %d\n", __func__, arg);
496 cxusb_bluebird_gpio_pulse(d, 0x01, 1); 496 cxusb_bluebird_gpio_pulse(d, 0x01, 1);
497 break; 497 break;
498 case XC2028_RESET_CLK: 498 case XC2028_RESET_CLK:
499 deb_info("%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg); 499 deb_info("%s: XC2028_RESET_CLK %d\n", __func__, arg);
500 break; 500 break;
501 default: 501 default:
502 deb_info("%s: unknown command %d, arg %d\n", __FUNCTION__, 502 deb_info("%s: unknown command %d, arg %d\n", __func__,
503 command, arg); 503 command, arg);
504 return -EINVAL; 504 return -EINVAL;
505 } 505 }
diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
index e37142d9271a..262a858c3068 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk-fe.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
@@ -152,7 +152,7 @@ static int gp8psk_fe_send_diseqc_msg (struct dvb_frontend* fe,
152{ 152{
153 struct gp8psk_fe_state *st = fe->demodulator_priv; 153 struct gp8psk_fe_state *st = fe->demodulator_priv;
154 154
155 deb_fe("%s\n",__FUNCTION__); 155 deb_fe("%s\n",__func__);
156 156
157 if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, m->msg[0], 0, 157 if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, m->msg[0], 0,
158 m->msg, m->msg_len)) { 158 m->msg, m->msg_len)) {
@@ -167,7 +167,7 @@ static int gp8psk_fe_send_diseqc_burst (struct dvb_frontend* fe,
167 struct gp8psk_fe_state *st = fe->demodulator_priv; 167 struct gp8psk_fe_state *st = fe->demodulator_priv;
168 u8 cmd; 168 u8 cmd;
169 169
170 deb_fe("%s\n",__FUNCTION__); 170 deb_fe("%s\n",__func__);
171 171
172 /* These commands are certainly wrong */ 172 /* These commands are certainly wrong */
173 cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01; 173 cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01;
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index a956bc503a4c..29ec2b967742 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -477,7 +477,7 @@ static struct qt1010_config m920x_qt1010_config = {
477/* Callbacks for DVB USB */ 477/* Callbacks for DVB USB */
478static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap) 478static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
479{ 479{
480 deb("%s\n",__FUNCTION__); 480 deb("%s\n",__func__);
481 481
482 if ((adap->fe = dvb_attach(mt352_attach, 482 if ((adap->fe = dvb_attach(mt352_attach,
483 &m920x_mt352_config, 483 &m920x_mt352_config,
@@ -489,7 +489,7 @@ static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
489 489
490static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap) 490static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)
491{ 491{
492 deb("%s\n",__FUNCTION__); 492 deb("%s\n",__func__);
493 493
494 if ((adap->fe = dvb_attach(tda10046_attach, 494 if ((adap->fe = dvb_attach(tda10046_attach,
495 &m920x_tda10046_08_config, 495 &m920x_tda10046_08_config,
@@ -501,7 +501,7 @@ static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)
501 501
502static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap) 502static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap)
503{ 503{
504 deb("%s\n",__FUNCTION__); 504 deb("%s\n",__func__);
505 505
506 if ((adap->fe = dvb_attach(tda10046_attach, 506 if ((adap->fe = dvb_attach(tda10046_attach,
507 &m920x_tda10046_0b_config, 507 &m920x_tda10046_0b_config,
@@ -513,7 +513,7 @@ static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap)
513 513
514static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap) 514static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
515{ 515{
516 deb("%s\n",__FUNCTION__); 516 deb("%s\n",__func__);
517 517
518 if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap, &m920x_qt1010_config) == NULL) 518 if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap, &m920x_qt1010_config) == NULL)
519 return -ENODEV; 519 return -ENODEV;
@@ -523,7 +523,7 @@ static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
523 523
524static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap) 524static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap)
525{ 525{
526 deb("%s\n",__FUNCTION__); 526 deb("%s\n",__func__);
527 527
528 if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, NULL) == NULL) 528 if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, NULL) == NULL)
529 return -ENODEV; 529 return -ENODEV;
@@ -533,7 +533,7 @@ static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap)
533 533
534static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap) 534static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap)
535{ 535{
536 deb("%s\n",__FUNCTION__); 536 deb("%s\n",__func__);
537 537
538 if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL) 538 if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL)
539 return -ENODEV; 539 return -ENODEV;
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index c3fdc7cd094e..ccc7e4452664 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -67,7 +67,7 @@ static int vp702x_fe_read_status(struct dvb_frontend* fe, fe_status_t *status)
67{ 67{
68 struct vp702x_fe_state *st = fe->demodulator_priv; 68 struct vp702x_fe_state *st = fe->demodulator_priv;
69 vp702x_fe_refresh_state(st); 69 vp702x_fe_refresh_state(st);
70 deb_fe("%s\n",__FUNCTION__); 70 deb_fe("%s\n",__func__);
71 71
72 if (st->lock == 0) 72 if (st->lock == 0)
73 *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER; 73 *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER;
@@ -121,7 +121,7 @@ static int vp702x_fe_read_snr(struct dvb_frontend* fe, u16 *snr)
121 121
122static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune) 122static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
123{ 123{
124 deb_fe("%s\n",__FUNCTION__); 124 deb_fe("%s\n",__func__);
125 tune->min_delay_ms = 2000; 125 tune->min_delay_ms = 2000;
126 return 0; 126 return 0;
127} 127}
@@ -183,21 +183,21 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe,
183static int vp702x_fe_init(struct dvb_frontend *fe) 183static int vp702x_fe_init(struct dvb_frontend *fe)
184{ 184{
185 struct vp702x_fe_state *st = fe->demodulator_priv; 185 struct vp702x_fe_state *st = fe->demodulator_priv;
186 deb_fe("%s\n",__FUNCTION__); 186 deb_fe("%s\n",__func__);
187 vp702x_usb_in_op(st->d, RESET_TUNER, 0, 0, NULL, 0); 187 vp702x_usb_in_op(st->d, RESET_TUNER, 0, 0, NULL, 0);
188 return 0; 188 return 0;
189} 189}
190 190
191static int vp702x_fe_sleep(struct dvb_frontend *fe) 191static int vp702x_fe_sleep(struct dvb_frontend *fe)
192{ 192{
193 deb_fe("%s\n",__FUNCTION__); 193 deb_fe("%s\n",__func__);
194 return 0; 194 return 0;
195} 195}
196 196
197static int vp702x_fe_get_frontend(struct dvb_frontend* fe, 197static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
198 struct dvb_frontend_parameters *fep) 198 struct dvb_frontend_parameters *fep)
199{ 199{
200 deb_fe("%s\n",__FUNCTION__); 200 deb_fe("%s\n",__func__);
201 return 0; 201 return 0;
202} 202}
203 203
@@ -208,7 +208,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
208 u8 cmd[8],ibuf[10]; 208 u8 cmd[8],ibuf[10];
209 memset(cmd,0,8); 209 memset(cmd,0,8);
210 210
211 deb_fe("%s\n",__FUNCTION__); 211 deb_fe("%s\n",__func__);
212 212
213 if (m->msg_len > 4) 213 if (m->msg_len > 4)
214 return -EINVAL; 214 return -EINVAL;
@@ -230,7 +230,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
230 230
231static int vp702x_fe_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst) 231static int vp702x_fe_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
232{ 232{
233 deb_fe("%s\n",__FUNCTION__); 233 deb_fe("%s\n",__func__);
234 return 0; 234 return 0;
235} 235}
236 236
@@ -238,7 +238,7 @@ static int vp702x_fe_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
238{ 238{
239 struct vp702x_fe_state *st = fe->demodulator_priv; 239 struct vp702x_fe_state *st = fe->demodulator_priv;
240 u8 ibuf[10]; 240 u8 ibuf[10];
241 deb_fe("%s\n",__FUNCTION__); 241 deb_fe("%s\n",__func__);
242 242
243 st->tone_mode = tone; 243 st->tone_mode = tone;
244 244
@@ -263,7 +263,7 @@ static int vp702x_fe_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t
263{ 263{
264 struct vp702x_fe_state *st = fe->demodulator_priv; 264 struct vp702x_fe_state *st = fe->demodulator_priv;
265 u8 ibuf[10]; 265 u8 ibuf[10];
266 deb_fe("%s\n",__FUNCTION__); 266 deb_fe("%s\n",__func__);
267 267
268 st->voltage = voltage; 268 st->voltage = voltage;
269 269