[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>

1 files changed, 15 insertions, 16 deletions

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index ae16112a065..8222b88cb48 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -315,7 +315,7 @@ dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
 
 int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
 /* tuner data is 21 bits long, must be left-aligned in data */
 /* tuner cx24108 is written through a dedicated 3wire interface on the demod chip */
@@ -356,7 +356,7 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
 
 static int cx24110_initfe(struct dvb_frontend* fe)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 /* fixme (low): error handling */
         int i;
 
@@ -373,7 +373,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
 
 static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         switch (voltage) {
         case SEC_VOLTAGE_13:
@@ -385,8 +385,7 @@ static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
         };
 }
 
-static int cx24110_diseqc_send_burst(struct dvb_frontend* fe,
-                        fe_sec_mini_cmd_t burst)
+static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
         int rv, bit, i;
         struct cx24110_state *state = fe->demodulator_priv;
@@ -413,7 +412,7 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
                                    struct dvb_diseqc_master_cmd *cmd)
 {
         int i, rv;
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         for (i = 0; i < cmd->msg_len; i++)
                 cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
@@ -432,7 +431,7 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
 
 static int cx24110_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         int sync = cx24110_readreg (state, 0x55);
 
@@ -460,7 +459,7 @@ static int cx24110_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int cx24110_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         /* fixme (maybe): value range is 16 bit. Scale? */
         if(cx24110_readreg(state,0x24)&0x10) {
@@ -478,7 +477,7 @@ static int cx24110_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int cx24110_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
 /* no provision in hardware. Read the frontend AGC accumulator. No idea how to scale this, but I know it is 2s complement */
         u8 signal = cx24110_readreg (state, 0x27)+128;
@@ -489,7 +488,7 @@ static int cx24110_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
 
 static int cx24110_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         /* no provision in hardware. Can be computed from the Es/N0 estimator, but I don't know how. */
         if(cx24110_readreg(state,0x6a)&0x80) {
@@ -505,7 +504,7 @@ static int cx24110_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
         u32 lastbyer;
 
         if(cx24110_readreg(state,0x10)&0x40) {
@@ -527,7 +526,7 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         state->config->pll_set(fe, p);
         cx24110_set_inversion (state, p->inversion);
@@ -540,7 +539,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
         s32 afc; unsigned sclk;
 
 /* cannot read back tuner settings (freq). Need to have some private storage */
@@ -567,14 +566,14 @@ static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int cx24110_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         return cx24110_writereg(state,0x76,(cx24110_readreg(state,0x76)&~0x10)|(((tone==SEC_TONE_ON))?0x10:0));
 }
 
 static void cx24110_release(struct dvb_frontend* fe)
 {
-        struct cx24110_state* state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -587,7 +586,7 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
         int ret;
 
         /* allocate memory for the internal state */
-        state = (struct cx24110_state*) kmalloc(sizeof(struct cx24110_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct cx24110_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */