diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 12:12:57 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 12:12:57 -0500 |
| commit | 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 (patch) | |
| tree | eaf56c1a77b0de6ee82e23cee4433b2c4a47e67e /drivers/media/dvb/frontends/sp8870.c | |
| parent | 259692bd5a2b2c2d351dd90748ba4126bc2a21b9 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 58ad34ef0a0..764a95a2e21 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) static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, struct dvb_frontend_parameters *p) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; int err; u16 reg0xc05; @@ -302,7 +302,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, static int sp8870_init (struct dvb_frontend* fe) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; const struct firmware *fw = NULL; sp8870_wake_up(state); @@ -358,7 +358,7 @@ static int sp8870_init (struct dvb_frontend* fe) static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; int status; int signal; @@ -384,7 +384,7 @@ static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status) static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; int ret; u32 tmp; @@ -412,7 +412,7 @@ static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; int ret; u16 tmp; @@ -438,7 +438,7 @@ static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; int ret; *ublocks = 0; @@ -467,7 +467,7 @@ static int switches = 0; static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; /* 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 static int sp8870_sleep(struct dvb_frontend* fe) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; // tristate TS output and disable interface pins return sp8870_writereg(state, 0xC18, 0x000); @@ -540,7 +540,7 @@ static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend static void sp8870_release(struct dvb_frontend* fe) { - struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv; + struct sp8870_state* state = fe->demodulator_priv; kfree(state); } @@ -552,7 +552,7 @@ struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, struct sp8870_state* state = NULL; /* allocate memory for the internal state */ - state = (struct sp8870_state*) kmalloc(sizeof(struct sp8870_state), GFP_KERNEL); + state = kmalloc(sizeof(struct sp8870_state), GFP_KERNEL); if (state == NULL) goto error; /* setup the state */ |