diff options
author | Johannes Stezenbach <js@linuxtv.org> | 2005-05-17 00:54:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 10:59:30 -0400 |
commit | b8742700f13163ffa00cddce2a3c940b9ab2ab5a (patch) | |
tree | ff82ac83508dc63d0dec63a3479df3b966018b34 /drivers/media/dvb/frontends/nxt6000.c | |
parent | 591ad98db3be2cd596ac5e0cfba7b164c3bdfb52 (diff) |
[PATCH] dvb: remove unnecessary casts in frontends
remove unnecessary casts in frontends (Kenneth Aafloy)
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/frontends/nxt6000.c')
-rw-r--r-- | drivers/media/dvb/frontends/nxt6000.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c index f79a69d0eb07..966de9853d18 100644 --- a/drivers/media/dvb/frontends/nxt6000.c +++ b/drivers/media/dvb/frontends/nxt6000.c | |||
@@ -176,7 +176,7 @@ static int nxt6000_set_transmission_mode(struct nxt6000_state* state, fe_transmi | |||
176 | 176 | ||
177 | static void nxt6000_setup(struct dvb_frontend* fe) | 177 | static void nxt6000_setup(struct dvb_frontend* fe) |
178 | { | 178 | { |
179 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 179 | struct nxt6000_state* state = fe->demodulator_priv; |
180 | 180 | ||
181 | nxt6000_writereg(state, RS_COR_SYNC_PARAM, SYNC_PARAM); | 181 | nxt6000_writereg(state, RS_COR_SYNC_PARAM, SYNC_PARAM); |
182 | nxt6000_writereg(state, BER_CTRL, /*(1 << 2) | */ (0x01 << 1) | 0x01); | 182 | nxt6000_writereg(state, BER_CTRL, /*(1 << 2) | */ (0x01 << 1) | 0x01); |
@@ -427,7 +427,7 @@ static void nxt6000_dump_status(struct nxt6000_state *state) | |||
427 | static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status) | 427 | static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status) |
428 | { | 428 | { |
429 | u8 core_status; | 429 | u8 core_status; |
430 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 430 | struct nxt6000_state* state = fe->demodulator_priv; |
431 | 431 | ||
432 | *status = 0; | 432 | *status = 0; |
433 | 433 | ||
@@ -456,7 +456,7 @@ static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
456 | 456 | ||
457 | static int nxt6000_init(struct dvb_frontend* fe) | 457 | static int nxt6000_init(struct dvb_frontend* fe) |
458 | { | 458 | { |
459 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 459 | struct nxt6000_state* state = fe->demodulator_priv; |
460 | 460 | ||
461 | nxt6000_reset(state); | 461 | nxt6000_reset(state); |
462 | nxt6000_setup(fe); | 462 | nxt6000_setup(fe); |
@@ -466,7 +466,7 @@ static int nxt6000_init(struct dvb_frontend* fe) | |||
466 | 466 | ||
467 | static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *param) | 467 | static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *param) |
468 | { | 468 | { |
469 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 469 | struct nxt6000_state* state = fe->demodulator_priv; |
470 | int result; | 470 | int result; |
471 | 471 | ||
472 | nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x01); /* open i2c bus switch */ | 472 | nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x01); /* open i2c bus switch */ |
@@ -487,13 +487,13 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
487 | 487 | ||
488 | static void nxt6000_release(struct dvb_frontend* fe) | 488 | static void nxt6000_release(struct dvb_frontend* fe) |
489 | { | 489 | { |
490 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 490 | struct nxt6000_state* state = fe->demodulator_priv; |
491 | kfree(state); | 491 | kfree(state); |
492 | } | 492 | } |
493 | 493 | ||
494 | static int nxt6000_read_snr(struct dvb_frontend* fe, u16* snr) | 494 | static int nxt6000_read_snr(struct dvb_frontend* fe, u16* snr) |
495 | { | 495 | { |
496 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 496 | struct nxt6000_state* state = fe->demodulator_priv; |
497 | 497 | ||
498 | *snr = nxt6000_readreg( state, OFDM_CHC_SNR) / 8; | 498 | *snr = nxt6000_readreg( state, OFDM_CHC_SNR) / 8; |
499 | 499 | ||
@@ -502,7 +502,7 @@ static int nxt6000_read_snr(struct dvb_frontend* fe, u16* snr) | |||
502 | 502 | ||
503 | static int nxt6000_read_ber(struct dvb_frontend* fe, u32* ber) | 503 | static int nxt6000_read_ber(struct dvb_frontend* fe, u32* ber) |
504 | { | 504 | { |
505 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 505 | struct nxt6000_state* state = fe->demodulator_priv; |
506 | 506 | ||
507 | nxt6000_writereg( state, VIT_COR_INTSTAT, 0x18 ); | 507 | nxt6000_writereg( state, VIT_COR_INTSTAT, 0x18 ); |
508 | 508 | ||
@@ -516,7 +516,7 @@ static int nxt6000_read_ber(struct dvb_frontend* fe, u32* ber) | |||
516 | 516 | ||
517 | static int nxt6000_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength) | 517 | static int nxt6000_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength) |
518 | { | 518 | { |
519 | struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv; | 519 | struct nxt6000_state* state = fe->demodulator_priv; |
520 | 520 | ||
521 | *signal_strength = (short) (511 - | 521 | *signal_strength = (short) (511 - |
522 | (nxt6000_readreg(state, AGC_GAIN_1) + | 522 | (nxt6000_readreg(state, AGC_GAIN_1) + |
@@ -533,7 +533,7 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config, | |||
533 | struct nxt6000_state* state = NULL; | 533 | struct nxt6000_state* state = NULL; |
534 | 534 | ||
535 | /* allocate memory for the internal state */ | 535 | /* allocate memory for the internal state */ |
536 | state = (struct nxt6000_state*) kmalloc(sizeof(struct nxt6000_state), GFP_KERNEL); | 536 | state = kmalloc(sizeof(struct nxt6000_state), GFP_KERNEL); |
537 | if (state == NULL) goto error; | 537 | if (state == NULL) goto error; |
538 | 538 | ||
539 | /* setup the state */ | 539 | /* setup the state */ |