diff options
Diffstat (limited to 'drivers/media/dvb/frontends/sp8870.c')
-rw-r--r-- | drivers/media/dvb/frontends/sp8870.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c index 58ad34ef0a00..764a95a2e212 100644 --- a/drivers/media/dvb/frontends/sp8870.c +++ b/drivers/media/dvb/frontends/sp8870.c | |||
@@ -248,7 +248,7 @@ static int sp8870_wake_up(struct sp8870_state* state) | |||
248 | static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, | 248 | static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, |
249 | struct dvb_frontend_parameters *p) | 249 | struct dvb_frontend_parameters *p) |
250 | { | 250 | { |
251 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 251 | struct sp8870_state* state = fe->demodulator_priv; |
252 | int err; | 252 | int err; |
253 | u16 reg0xc05; | 253 | u16 reg0xc05; |
254 | 254 | ||
@@ -302,7 +302,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, | |||
302 | 302 | ||
303 | static int sp8870_init (struct dvb_frontend* fe) | 303 | static int sp8870_init (struct dvb_frontend* fe) |
304 | { | 304 | { |
305 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 305 | struct sp8870_state* state = fe->demodulator_priv; |
306 | const struct firmware *fw = NULL; | 306 | const struct firmware *fw = NULL; |
307 | 307 | ||
308 | sp8870_wake_up(state); | 308 | sp8870_wake_up(state); |
@@ -358,7 +358,7 @@ static int sp8870_init (struct dvb_frontend* fe) | |||
358 | 358 | ||
359 | static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status) | 359 | static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status) |
360 | { | 360 | { |
361 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 361 | struct sp8870_state* state = fe->demodulator_priv; |
362 | int status; | 362 | int status; |
363 | int signal; | 363 | int signal; |
364 | 364 | ||
@@ -384,7 +384,7 @@ static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status) | |||
384 | 384 | ||
385 | static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) | 385 | static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) |
386 | { | 386 | { |
387 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 387 | struct sp8870_state* state = fe->demodulator_priv; |
388 | int ret; | 388 | int ret; |
389 | u32 tmp; | 389 | u32 tmp; |
390 | 390 | ||
@@ -412,7 +412,7 @@ static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) | |||
412 | 412 | ||
413 | static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) | 413 | static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) |
414 | { | 414 | { |
415 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 415 | struct sp8870_state* state = fe->demodulator_priv; |
416 | int ret; | 416 | int ret; |
417 | u16 tmp; | 417 | u16 tmp; |
418 | 418 | ||
@@ -438,7 +438,7 @@ static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) | |||
438 | 438 | ||
439 | static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks) | 439 | static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks) |
440 | { | 440 | { |
441 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 441 | struct sp8870_state* state = fe->demodulator_priv; |
442 | int ret; | 442 | int ret; |
443 | 443 | ||
444 | *ublocks = 0; | 444 | *ublocks = 0; |
@@ -467,7 +467,7 @@ static int switches = 0; | |||
467 | 467 | ||
468 | static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p) | 468 | static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p) |
469 | { | 469 | { |
470 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 470 | struct sp8870_state* state = fe->demodulator_priv; |
471 | 471 | ||
472 | /* | 472 | /* |
473 | The firmware of the sp8870 sometimes locks up after setting frontend parameters. | 473 | The firmware of the sp8870 sometimes locks up after setting frontend parameters. |
@@ -524,7 +524,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par | |||
524 | 524 | ||
525 | static int sp8870_sleep(struct dvb_frontend* fe) | 525 | static int sp8870_sleep(struct dvb_frontend* fe) |
526 | { | 526 | { |
527 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 527 | struct sp8870_state* state = fe->demodulator_priv; |
528 | 528 | ||
529 | // tristate TS output and disable interface pins | 529 | // tristate TS output and disable interface pins |
530 | return sp8870_writereg(state, 0xC18, 0x000); | 530 | return sp8870_writereg(state, 0xC18, 0x000); |
@@ -540,7 +540,7 @@ static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend | |||
540 | 540 | ||
541 | static void sp8870_release(struct dvb_frontend* fe) | 541 | static void sp8870_release(struct dvb_frontend* fe) |
542 | { | 542 | { |
543 | struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; | 543 | struct sp8870_state* state = fe->demodulator_priv; |
544 | kfree(state); | 544 | kfree(state); |
545 | } | 545 | } |
546 | 546 | ||
@@ -552,7 +552,7 @@ struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, | |||
552 | struct sp8870_state* state = NULL; | 552 | struct sp8870_state* state = NULL; |
553 | 553 | ||
554 | /* allocate memory for the internal state */ | 554 | /* allocate memory for the internal state */ |
555 | state = (struct sp8870_state*) kmalloc(sizeof(struct sp8870_state), GFP_KERNEL); | 555 | state = kmalloc(sizeof(struct sp8870_state), GFP_KERNEL); |
556 | if (state == NULL) goto error; | 556 | if (state == NULL) goto error; |
557 | 557 | ||
558 | /* setup the state */ | 558 | /* setup the state */ |