Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / media / dvb / frontends / cx22702.c

diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 00b5c7e91d5d8189ca212f297fbd0fccf908ae29..ff6c4983051c3d20adf3052a0e62e2f90ecc9172 100644 (file)
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 #define dprintk        if (debug) printk
 
 /* Register values to initialise the demod */
-static u8 init_tab[] = {
+static const u8 init_tab[] = {
        0x00, 0x00, /* Stop aquisition */
        0x0B, 0x06,
        0x09, 0x01,
@@ -92,52 +92,56 @@ static int cx22702_writereg(struct cx22702_state *state, u8 reg, u8 data)
 
        ret = i2c_transfer(state->i2c, &msg, 1);
 
-       if (ret != 1)
+       if (unlikely(ret != 1)) {
                printk(KERN_ERR
                        "%s: error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
                        __func__, reg, data, ret);
+               return -1;
+       }
 
-       return (ret != 1) ? -1 : 0;
+       return 0;
 }
 
 static u8 cx22702_readreg(struct cx22702_state *state, u8 reg)
 {
        int ret;
-       u8 b0[] = { reg };
-       u8 b1[] = { 0 };
+       u8 data;
 
        struct i2c_msg msg[] = {
                { .addr = state->config->demod_address, .flags = 0,
-                       .buf = b0, .len = 1 },
+                       .buf = &reg, .len = 1 },
                { .addr = state->config->demod_address, .flags = I2C_M_RD,
-                       .buf = b1, .len = 1 } };
+                       .buf = &data, .len = 1 } };
 
        ret = i2c_transfer(state->i2c, msg, 2);
 
-       if (ret != 2)
-               printk(KERN_ERR "%s: readreg error (ret == %i)\n",
-                       __func__, ret);
+       if (unlikely(ret != 2)) {
+               printk(KERN_ERR "%s: error (reg == 0x%02x, ret == %i)\n",
+                       __func__, reg, ret);
+               return 0;
+       }
 
-       return b1[0];
+       return data;
 }
 
 static int cx22702_set_inversion(struct cx22702_state *state, int inversion)
 {
        u8 val;
 
+       val = cx22702_readreg(state, 0x0C);
        switch (inversion) {
        case INVERSION_AUTO:
                return -EOPNOTSUPP;
        case INVERSION_ON:
-               val = cx22702_readreg(state, 0x0C);
-               return cx22702_writereg(state, 0x0C, val | 0x01);
+               val |= 0x01;
+               break;
        case INVERSION_OFF:
-               val = cx22702_readreg(state, 0x0C);
-               return cx22702_writereg(state, 0x0C, val & 0xfe);
+               val &= 0xfe;
+               break;
        default:
                return -EINVAL;
        }
-
+       return cx22702_writereg(state, 0x0C, val);
 }
 
 /* Retrieve the demod settings */
@@ -244,13 +248,15 @@ static int cx22702_get_tps(struct cx22702_state *state,
 static int cx22702_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 {
        struct cx22702_state *state = fe->demodulator_priv;
+       u8 val;
+
        dprintk("%s(%d)\n", __func__, enable);
+       val = cx22702_readreg(state, 0x0D);
        if (enable)
-               return cx22702_writereg(state, 0x0D,
-                       cx22702_readreg(state, 0x0D) & 0xfe);
+               val &= 0xfe;
        else
-               return cx22702_writereg(state, 0x0D,
-                       cx22702_readreg(state, 0x0D) | 1);
+               val |= 0x01;
+       return cx22702_writereg(state, 0x0D, val);
 }
 
 /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
@@ -270,23 +276,21 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
        cx22702_set_inversion(state, p->inversion);
 
        /* set bandwidth */
+       val = cx22702_readreg(state, 0x0C) & 0xcf;
        switch (p->u.ofdm.bandwidth) {
        case BANDWIDTH_6_MHZ:
-               cx22702_writereg(state, 0x0C,
-                       (cx22702_readreg(state, 0x0C) & 0xcf) | 0x20);
+               val |= 0x20;
                break;
        case BANDWIDTH_7_MHZ:
-               cx22702_writereg(state, 0x0C,
-                       (cx22702_readreg(state, 0x0C) & 0xcf) | 0x10);
+               val |= 0x10;
                break;
        case BANDWIDTH_8_MHZ:
-               cx22702_writereg(state, 0x0C,
-                       cx22702_readreg(state, 0x0C) & 0xcf);
                break;
        default:
                dprintk("%s: invalid bandwidth\n", __func__);
                return -EINVAL;
        }
+       cx22702_writereg(state, 0x0C, val);
 
        p->u.ofdm.code_rate_LP = FEC_AUTO; /* temp hack as manual not working */
 
@@ -312,33 +316,31 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
        }
 
        /* manually programmed values */
-       val = 0;
-       switch (p->u.ofdm.constellation) {
+       switch (p->u.ofdm.constellation) {              /* mask 0x18 */
        case QPSK:
-               val = (val & 0xe7);
+               val = 0x00;
                break;
        case QAM_16:
-               val = (val & 0xe7) | 0x08;
+               val = 0x08;
                break;
        case QAM_64:
-               val = (val & 0xe7) | 0x10;
+               val = 0x10;
                break;
        default:
                dprintk("%s: invalid constellation\n", __func__);
                return -EINVAL;
        }
-       switch (p->u.ofdm.hierarchy_information) {
+       switch (p->u.ofdm.hierarchy_information) {      /* mask 0x07 */
        case HIERARCHY_NONE:
-               val = (val & 0xf8);
                break;
        case HIERARCHY_1:
-               val = (val & 0xf8) | 1;
+               val |= 0x01;
                break;
        case HIERARCHY_2:
-               val = (val & 0xf8) | 2;
+               val |= 0x02;
                break;
        case HIERARCHY_4:
-               val = (val & 0xf8) | 3;
+               val |= 0x03;
                break;
        default:
                dprintk("%s: invalid hierarchy\n", __func__);
@@ -346,44 +348,42 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
        }
        cx22702_writereg(state, 0x06, val);
 
-       val = 0;
-       switch (p->u.ofdm.code_rate_HP) {
+       switch (p->u.ofdm.code_rate_HP) {               /* mask 0x38 */
        case FEC_NONE:
        case FEC_1_2:
-               val = (val & 0xc7);
+               val = 0x00;
                break;
        case FEC_2_3:
-               val = (val & 0xc7) | 0x08;
+               val = 0x08;
                break;
        case FEC_3_4:
-               val = (val & 0xc7) | 0x10;
+               val = 0x10;
                break;
        case FEC_5_6:
-               val = (val & 0xc7) | 0x18;
+               val = 0x18;
                break;
        case FEC_7_8:
-               val = (val & 0xc7) | 0x20;
+               val = 0x20;
                break;
        default:
                dprintk("%s: invalid code_rate_HP\n", __func__);
                return -EINVAL;
        }
-       switch (p->u.ofdm.code_rate_LP) {
+       switch (p->u.ofdm.code_rate_LP) {               /* mask 0x07 */
        case FEC_NONE:
        case FEC_1_2:
-               val = (val & 0xf8);
                break;
        case FEC_2_3:
-               val = (val & 0xf8) | 1;
+               val |= 0x01;
                break;
        case FEC_3_4:
-               val = (val & 0xf8) | 2;
+               val |= 0x02;
                break;
        case FEC_5_6:
-               val = (val & 0xf8) | 3;
+               val |= 0x03;
                break;
        case FEC_7_8:
-               val = (val & 0xf8) | 4;
+               val |= 0x04;
                break;
        default:
                dprintk("%s: invalid code_rate_LP\n", __func__);
@@ -391,30 +391,28 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
        }
        cx22702_writereg(state, 0x07, val);
 
-       val = 0;
-       switch (p->u.ofdm.guard_interval) {
+       switch (p->u.ofdm.guard_interval) {             /* mask 0x0c */
        case GUARD_INTERVAL_1_32:
-               val = (val & 0xf3);
+               val = 0x00;
                break;
        case GUARD_INTERVAL_1_16:
-               val = (val & 0xf3) | 0x04;
+               val = 0x04;
                break;
        case GUARD_INTERVAL_1_8:
-               val = (val & 0xf3) | 0x08;
+               val = 0x08;
                break;
        case GUARD_INTERVAL_1_4:
-               val = (val & 0xf3) | 0x0c;
+               val = 0x0c;
                break;
        default:
                dprintk("%s: invalid guard_interval\n", __func__);
                return -EINVAL;
        }
-       switch (p->u.ofdm.transmission_mode) {
+       switch (p->u.ofdm.transmission_mode) {          /* mask 0x03 */
        case TRANSMISSION_MODE_2K:
-               val = (val & 0xfc);
                break;
        case TRANSMISSION_MODE_8K:
-               val = (val & 0xfc) | 1;
+               val |= 0x1;
                break;
        default:
                dprintk("%s: invalid transmission_mode\n", __func__);
@@ -505,7 +503,7 @@ static int cx22702_read_signal_strength(struct dvb_frontend *fe,
 {
        struct cx22702_state *state = fe->demodulator_priv;
 
-       u16 rs_ber = 0;
+       u16 rs_ber;
        rs_ber = cx22702_readreg(state, 0x23);
        *signal_strength = (rs_ber << 8) | rs_ber;
 
@@ -516,7 +514,7 @@ static int cx22702_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
        struct cx22702_state *state = fe->demodulator_priv;
 
-       u16 rs_ber = 0;
+       u16 rs_ber;
        if (cx22702_readreg(state, 0xE4) & 0x02) {
                /* Realtime statistics */
                rs_ber = (cx22702_readreg(state, 0xDE) & 0x7F) << 7
@@ -572,7 +570,7 @@ static void cx22702_release(struct dvb_frontend *fe)
        kfree(state);
 }
 
-static struct dvb_frontend_ops cx22702_ops;
+static const struct dvb_frontend_ops cx22702_ops;
 
 struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,
        struct i2c_adapter *i2c)
@@ -587,7 +585,6 @@ struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,
        /* setup the state */
        state->config = config;
        state->i2c = i2c;
-       state->prevUCBlocks = 0;
 
        /* check if the demod is there */
        if (cx22702_readreg(state, 0x1f) != 0x3)
@@ -605,7 +602,7 @@ error:
 }
 EXPORT_SYMBOL(cx22702_attach);
 
-static struct dvb_frontend_ops cx22702_ops = {
+static const struct dvb_frontend_ops cx22702_ops = {
 
        .info = {
                .name                   = "Conexant CX22702 DVB-T",