Merge branch 'pxa-devel' into pxa

[linux-2.6] / drivers / media / dvb / ttusb-dec / ttusbdecfe.c

diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
index a5a46175fa0969e302e59e75e14afa5a2e5cf2ab..443af24097f34118fe51c66aa7bb80aa12d17c1f 100644 (file)
--- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
@@ -28,8 +28,6 @@
 
 struct ttusbdecfe_state {
 
-       struct dvb_frontend_ops ops;
-
        /* configuration settings */
        const struct ttusbdecfe_config* config;
 
@@ -55,7 +53,7 @@ static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status)
                return ret;
 
        if(len != 4) {
-               printk(KERN_ERR "%s: unexpected reply\n", __FUNCTION__);
+               printk(KERN_ERR "%s: unexpected reply\n", __func__);
                return -EIO;
        }
 
@@ -72,7 +70,7 @@ static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status)
                        break;
                default:
                        pr_info("%s: returned unknown value: %d\n",
-                               __FUNCTION__, result[3]);
+                               __func__, result[3]);
                        return -EIO;
        }
 
@@ -88,7 +86,7 @@ static int ttusbdecfe_dvbt_set_frontend(struct dvb_frontend* fe, struct dvb_fron
                   0x00, 0x00, 0x00, 0xff,
                   0x00, 0x00, 0x00, 0xff };
 
-       u32 freq = htonl(p->frequency / 1000);
+       __be32 freq = htonl(p->frequency / 1000);
        memcpy(&b[4], &freq, sizeof (u32));
        state->config->send_command(fe, 0x71, sizeof(b), b, NULL, NULL);
 
@@ -119,10 +117,10 @@ static int ttusbdecfe_dvbs_set_frontend(struct dvb_frontend* fe, struct dvb_fron
                   0x00, 0x00, 0x00, 0x00,
                   0x00, 0x00, 0x00, 0x00,
                   0x00, 0x00, 0x00, 0x00 };
-       u32 freq;
-       u32 sym_rate;
-       u32 band;
-       u32 lnb_voltage;
+       __be32 freq;
+       __be32 sym_rate;
+       __be32 band;
+       __be32 lnb_voltage;
 
        freq = htonl(p->frequency +
               (state->hi_band ? LOF_HI : LOF_LO));
@@ -197,16 +195,15 @@ struct dvb_frontend* ttusbdecfe_dvbt_attach(const struct ttusbdecfe_config* conf
        struct ttusbdecfe_state* state = NULL;
 
        /* allocate memory for the internal state */
-       state = (struct ttusbdecfe_state*) kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
+       state = kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
        if (state == NULL)
                return NULL;
 
        /* setup the state */
        state->config = config;
-       memcpy(&state->ops, &ttusbdecfe_dvbt_ops, sizeof(struct dvb_frontend_ops));
 
        /* create dvb_frontend */
-       state->frontend.ops = &state->ops;
+       memcpy(&state->frontend.ops, &ttusbdecfe_dvbt_ops, sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
        return &state->frontend;
 }
@@ -218,7 +215,7 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf
        struct ttusbdecfe_state* state = NULL;
 
        /* allocate memory for the internal state */
-       state = (struct ttusbdecfe_state*) kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
+       state = kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
        if (state == NULL)
                return NULL;
 
@@ -226,10 +223,9 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf
        state->config = config;
        state->voltage = 0;
        state->hi_band = 0;
-       memcpy(&state->ops, &ttusbdecfe_dvbs_ops, sizeof(struct dvb_frontend_ops));
 
        /* create dvb_frontend */
-       state->frontend.ops = &state->ops;
+       memcpy(&state->frontend.ops, &ttusbdecfe_dvbs_ops, sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
        return &state->frontend;
 }