diff options
Diffstat (limited to 'drivers/media/dvb/frontends/mt312.c')
-rw-r--r-- | drivers/media/dvb/frontends/mt312.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index 176a22e3441b..e455aecd76b2 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -226,7 +226,7 @@ static int mt312_get_code_rate(struct mt312_state* state, fe_code_rate_t *cr) | |||
226 | 226 | ||
227 | static int mt312_initfe(struct dvb_frontend* fe) | 227 | static int mt312_initfe(struct dvb_frontend* fe) |
228 | { | 228 | { |
229 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 229 | struct mt312_state *state = fe->demodulator_priv; |
230 | int ret; | 230 | int ret; |
231 | u8 buf[2]; | 231 | u8 buf[2]; |
232 | 232 | ||
@@ -287,7 +287,7 @@ static int mt312_initfe(struct dvb_frontend* fe) | |||
287 | static int mt312_send_master_cmd(struct dvb_frontend* fe, | 287 | static int mt312_send_master_cmd(struct dvb_frontend* fe, |
288 | struct dvb_diseqc_master_cmd *c) | 288 | struct dvb_diseqc_master_cmd *c) |
289 | { | 289 | { |
290 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 290 | struct mt312_state *state = fe->demodulator_priv; |
291 | int ret; | 291 | int ret; |
292 | u8 diseqc_mode; | 292 | u8 diseqc_mode; |
293 | 293 | ||
@@ -318,7 +318,7 @@ static int mt312_send_master_cmd(struct dvb_frontend* fe, | |||
318 | 318 | ||
319 | static int mt312_send_burst(struct dvb_frontend* fe, const fe_sec_mini_cmd_t c) | 319 | static int mt312_send_burst(struct dvb_frontend* fe, const fe_sec_mini_cmd_t c) |
320 | { | 320 | { |
321 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 321 | struct mt312_state *state = fe->demodulator_priv; |
322 | const u8 mini_tab[2] = { 0x02, 0x03 }; | 322 | const u8 mini_tab[2] = { 0x02, 0x03 }; |
323 | 323 | ||
324 | int ret; | 324 | int ret; |
@@ -340,7 +340,7 @@ static int mt312_send_burst(struct dvb_frontend* fe, const fe_sec_mini_cmd_t c) | |||
340 | 340 | ||
341 | static int mt312_set_tone(struct dvb_frontend* fe, const fe_sec_tone_mode_t t) | 341 | static int mt312_set_tone(struct dvb_frontend* fe, const fe_sec_tone_mode_t t) |
342 | { | 342 | { |
343 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 343 | struct mt312_state *state = fe->demodulator_priv; |
344 | const u8 tone_tab[2] = { 0x01, 0x00 }; | 344 | const u8 tone_tab[2] = { 0x01, 0x00 }; |
345 | 345 | ||
346 | int ret; | 346 | int ret; |
@@ -362,7 +362,7 @@ static int mt312_set_tone(struct dvb_frontend* fe, const fe_sec_tone_mode_t t) | |||
362 | 362 | ||
363 | static int mt312_set_voltage(struct dvb_frontend* fe, const fe_sec_voltage_t v) | 363 | static int mt312_set_voltage(struct dvb_frontend* fe, const fe_sec_voltage_t v) |
364 | { | 364 | { |
365 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 365 | struct mt312_state *state = fe->demodulator_priv; |
366 | const u8 volt_tab[3] = { 0x00, 0x40, 0x00 }; | 366 | const u8 volt_tab[3] = { 0x00, 0x40, 0x00 }; |
367 | 367 | ||
368 | if (v > SEC_VOLTAGE_OFF) | 368 | if (v > SEC_VOLTAGE_OFF) |
@@ -373,7 +373,7 @@ static int mt312_set_voltage(struct dvb_frontend* fe, const fe_sec_voltage_t v) | |||
373 | 373 | ||
374 | static int mt312_read_status(struct dvb_frontend* fe, fe_status_t *s) | 374 | static int mt312_read_status(struct dvb_frontend* fe, fe_status_t *s) |
375 | { | 375 | { |
376 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 376 | struct mt312_state *state = fe->demodulator_priv; |
377 | int ret; | 377 | int ret; |
378 | u8 status[3]; | 378 | u8 status[3]; |
379 | 379 | ||
@@ -400,7 +400,7 @@ static int mt312_read_status(struct dvb_frontend* fe, fe_status_t *s) | |||
400 | 400 | ||
401 | static int mt312_read_ber(struct dvb_frontend* fe, u32 *ber) | 401 | static int mt312_read_ber(struct dvb_frontend* fe, u32 *ber) |
402 | { | 402 | { |
403 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 403 | struct mt312_state *state = fe->demodulator_priv; |
404 | int ret; | 404 | int ret; |
405 | u8 buf[3]; | 405 | u8 buf[3]; |
406 | 406 | ||
@@ -414,7 +414,7 @@ static int mt312_read_ber(struct dvb_frontend* fe, u32 *ber) | |||
414 | 414 | ||
415 | static int mt312_read_signal_strength(struct dvb_frontend* fe, u16 *signal_strength) | 415 | static int mt312_read_signal_strength(struct dvb_frontend* fe, u16 *signal_strength) |
416 | { | 416 | { |
417 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 417 | struct mt312_state *state = fe->demodulator_priv; |
418 | int ret; | 418 | int ret; |
419 | u8 buf[3]; | 419 | u8 buf[3]; |
420 | u16 agc; | 420 | u16 agc; |
@@ -435,7 +435,7 @@ static int mt312_read_signal_strength(struct dvb_frontend* fe, u16 *signal_stren | |||
435 | 435 | ||
436 | static int mt312_read_snr(struct dvb_frontend* fe, u16 *snr) | 436 | static int mt312_read_snr(struct dvb_frontend* fe, u16 *snr) |
437 | { | 437 | { |
438 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 438 | struct mt312_state *state = fe->demodulator_priv; |
439 | int ret; | 439 | int ret; |
440 | u8 buf[2]; | 440 | u8 buf[2]; |
441 | 441 | ||
@@ -449,7 +449,7 @@ static int mt312_read_snr(struct dvb_frontend* fe, u16 *snr) | |||
449 | 449 | ||
450 | static int mt312_read_ucblocks(struct dvb_frontend* fe, u32 *ubc) | 450 | static int mt312_read_ucblocks(struct dvb_frontend* fe, u32 *ubc) |
451 | { | 451 | { |
452 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 452 | struct mt312_state *state = fe->demodulator_priv; |
453 | int ret; | 453 | int ret; |
454 | u8 buf[2]; | 454 | u8 buf[2]; |
455 | 455 | ||
@@ -464,7 +464,7 @@ static int mt312_read_ucblocks(struct dvb_frontend* fe, u32 *ubc) | |||
464 | static int mt312_set_frontend(struct dvb_frontend* fe, | 464 | static int mt312_set_frontend(struct dvb_frontend* fe, |
465 | struct dvb_frontend_parameters *p) | 465 | struct dvb_frontend_parameters *p) |
466 | { | 466 | { |
467 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 467 | struct mt312_state *state = fe->demodulator_priv; |
468 | int ret; | 468 | int ret; |
469 | u8 buf[5], config_val; | 469 | u8 buf[5], config_val; |
470 | u16 sr; | 470 | u16 sr; |
@@ -560,7 +560,7 @@ static int mt312_set_frontend(struct dvb_frontend* fe, | |||
560 | static int mt312_get_frontend(struct dvb_frontend* fe, | 560 | static int mt312_get_frontend(struct dvb_frontend* fe, |
561 | struct dvb_frontend_parameters *p) | 561 | struct dvb_frontend_parameters *p) |
562 | { | 562 | { |
563 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 563 | struct mt312_state *state = fe->demodulator_priv; |
564 | int ret; | 564 | int ret; |
565 | 565 | ||
566 | if ((ret = mt312_get_inversion(state, &p->inversion)) < 0) | 566 | if ((ret = mt312_get_inversion(state, &p->inversion)) < 0) |
@@ -577,7 +577,7 @@ static int mt312_get_frontend(struct dvb_frontend* fe, | |||
577 | 577 | ||
578 | static int mt312_sleep(struct dvb_frontend* fe) | 578 | static int mt312_sleep(struct dvb_frontend* fe) |
579 | { | 579 | { |
580 | struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv; | 580 | struct mt312_state *state = fe->demodulator_priv; |
581 | int ret; | 581 | int ret; |
582 | u8 config; | 582 | u8 config; |
583 | 583 | ||
@@ -605,7 +605,7 @@ static int mt312_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_ | |||
605 | 605 | ||
606 | static void mt312_release(struct dvb_frontend* fe) | 606 | static void mt312_release(struct dvb_frontend* fe) |
607 | { | 607 | { |
608 | struct mt312_state* state = (struct mt312_state*) fe->demodulator_priv; | 608 | struct mt312_state* state = fe->demodulator_priv; |
609 | kfree(state); | 609 | kfree(state); |
610 | } | 610 | } |
611 | 611 | ||
@@ -617,7 +617,7 @@ struct dvb_frontend* vp310_attach(const struct mt312_config* config, | |||
617 | struct mt312_state* state = NULL; | 617 | struct mt312_state* state = NULL; |
618 | 618 | ||
619 | /* allocate memory for the internal state */ | 619 | /* allocate memory for the internal state */ |
620 | state = (struct mt312_state*) kmalloc(sizeof(struct mt312_state), GFP_KERNEL); | 620 | state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL); |
621 | if (state == NULL) | 621 | if (state == NULL) |
622 | goto error; | 622 | goto error; |
623 | 623 | ||
@@ -651,7 +651,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config, | |||
651 | struct mt312_state* state = NULL; | 651 | struct mt312_state* state = NULL; |
652 | 652 | ||
653 | /* allocate memory for the internal state */ | 653 | /* allocate memory for the internal state */ |
654 | state = (struct mt312_state*) kmalloc(sizeof(struct mt312_state), GFP_KERNEL); | 654 | state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL); |
655 | if (state == NULL) | 655 | if (state == NULL) |
656 | goto error; | 656 | goto error; |
657 | 657 | ||