11 files changed, 936 insertions, 715 deletions
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 9430e03dba6c..5d1abe34bddb 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -34,13 +34,12 @@
 #include "dvb_frontend.h"
 #include "cx22702.h"
 struct cx22702_state {
-        struct i2c_adapter* i2c;
+        struct i2c_adapter *i2c;
        /* configuration settings */
-        const struct cx22702_config* config;
+        const struct cx22702_config *config;
        struct dvb_frontend frontend;
@@ -49,10 +48,13 @@ struct cx22702_state {
 };
 static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 #define dprintk if (debug) printk
 /* Register values to initialise the demod */
-static u8 init_tab [] = {
+static u8 init_tab[] = {
        0x00, 0x00, /* Stop aquisition */
        0x0B, 0x06,
        0x09, 0x01,
@@ -80,65 +82,67 @@ static u8 init_tab [] = {
        0xfd, 0x00,
 };
-static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data)
+static int cx22702_writereg(struct cx22702_state *state, u8 reg, u8 data)
 {
        int ret;
-        u8 buf [] = { reg, data };
+        u8 buf[] = { reg, data };
-        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
+        struct i2c_msg msg = {
+                .addr = state->config->demod_address, .flags = 0,
+                        .buf = buf, .len = 2 };
        ret = i2c_transfer(state->i2c, &msg, 1);
        if (ret != 1)
-                printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
+                printk(KERN_ERR
+                        "%s: error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
                        __func__, reg, data, ret);
        return (ret != 1) ? -1 : 0;
 }
-static u8 cx22702_readreg (struct cx22702_state* state, u8 reg)
+static u8 cx22702_readreg(struct cx22702_state *state, u8 reg)
 {
        int ret;
-        u8 b0 [] = { reg };
+        u8 b0[] = { reg };
-        u8 b1 [] = { 0 };
+        u8 b1[] = { 0 };
-        struct i2c_msg msg [] = {
+        struct i2c_msg msg[] = {
-                { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
+                { .addr = state->config->demod_address, .flags = 0,
-                { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
+                        .buf = b0, .len = 1 },
+                { .addr = state->config->demod_address, .flags = I2C_M_RD,
+                        .buf = b1, .len = 1 } };
        ret = i2c_transfer(state->i2c, msg, 2);
        if (ret != 2)
-                printk("%s: readreg error (ret == %i)\n", __func__, ret);
+                printk(KERN_ERR "%s: readreg error (ret == %i)\n",
+                        __func__, ret);
        return b1[0];
 }
-static int cx22702_set_inversion (struct cx22702_state *state, int inversion)
+static int cx22702_set_inversion(struct cx22702_state *state, int inversion)
 {
        u8 val;
        switch (inversion) {
+        case INVERSION_AUTO:
-                case INVERSION_AUTO:
+                return -EOPNOTSUPP;
-                        return -EOPNOTSUPP;
+        case INVERSION_ON:
+                val = cx22702_readreg(state, 0x0C);
-                case INVERSION_ON:
+                return cx22702_writereg(state, 0x0C, val | 0x01);
-                        val = cx22702_readreg (state, 0x0C);
+        case INVERSION_OFF:
-                        return cx22702_writereg (state, 0x0C, val | 0x01);
+                val = cx22702_readreg(state, 0x0C);
+                return cx22702_writereg(state, 0x0C, val & 0xfe);
-                case INVERSION_OFF:
+        default:
-                        val = cx22702_readreg (state, 0x0C);
+                return -EINVAL;
-                        return cx22702_writereg (state, 0x0C, val & 0xfe);
-                default:
-                        return -EINVAL;
        }
 }
 /* Retrieve the demod settings */
-static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_parameters *p)
+static int cx22702_get_tps(struct cx22702_state *state,
+        struct dvb_ofdm_parameters *p)
 {
        u8 val;
@@ -146,180 +150,281 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet
        if (!(cx22702_readreg(state, 0x0A) & 0x20))
                return -EAGAIN;
-        val = cx22702_readreg (state, 0x01);
+        val = cx22702_readreg(state, 0x01);
-        switch( (val&0x18)>>3) {
+        switch ((val & 0x18) >> 3) {
-                case 0: p->constellation =   QPSK; break;
+        case 0:
-                case 1: p->constellation = QAM_16; break;
+                p->constellation = QPSK;
-                case 2: p->constellation = QAM_64; break;
+                break;
+        case 1:
+                p->constellation = QAM_16;
+                break;
+        case 2:
+                p->constellation = QAM_64;
+                break;
        }
-        switch( val&0x07 ) {
+        switch (val & 0x07) {
-                case 0: p->hierarchy_information = HIERARCHY_NONE; break;
+        case 0:
-                case 1: p->hierarchy_information =    HIERARCHY_1; break;
+                p->hierarchy_information = HIERARCHY_NONE;
-                case 2: p->hierarchy_information =    HIERARCHY_2; break;
+                break;
-                case 3: p->hierarchy_information =    HIERARCHY_4; break;
+        case 1:
+                p->hierarchy_information = HIERARCHY_1;
+                break;
+        case 2:
+                p->hierarchy_information = HIERARCHY_2;
+                break;
+        case 3:
+                p->hierarchy_information = HIERARCHY_4;
+                break;
        }
-        val = cx22702_readreg (state, 0x02);
+        val = cx22702_readreg(state, 0x02);
-        switch( (val&0x38)>>3 ) {
+        switch ((val & 0x38) >> 3) {
-                case 0: p->code_rate_HP = FEC_1_2; break;
+        case 0:
-                case 1: p->code_rate_HP = FEC_2_3; break;
+                p->code_rate_HP = FEC_1_2;
-                case 2: p->code_rate_HP = FEC_3_4; break;
+                break;
-                case 3: p->code_rate_HP = FEC_5_6; break;
+        case 1:
-                case 4: p->code_rate_HP = FEC_7_8; break;
+                p->code_rate_HP = FEC_2_3;
+                break;
+        case 2:
+                p->code_rate_HP = FEC_3_4;
+                break;
+        case 3:
+                p->code_rate_HP = FEC_5_6;
+                break;
+        case 4:
+                p->code_rate_HP = FEC_7_8;
+                break;
        }
-        switch( val&0x07 ) {
+        switch (val & 0x07) {
-                case 0: p->code_rate_LP = FEC_1_2; break;
+        case 0:
-                case 1: p->code_rate_LP = FEC_2_3; break;
+                p->code_rate_LP = FEC_1_2;
-                case 2: p->code_rate_LP = FEC_3_4; break;
+                break;
-                case 3: p->code_rate_LP = FEC_5_6; break;
+        case 1:
-                case 4: p->code_rate_LP = FEC_7_8; break;
+                p->code_rate_LP = FEC_2_3;
+                break;
+        case 2:
+                p->code_rate_LP = FEC_3_4;
+                break;
+        case 3:
+                p->code_rate_LP = FEC_5_6;
+                break;
+        case 4:
+                p->code_rate_LP = FEC_7_8;
+                break;
        }
+        val = cx22702_readreg(state, 0x03);
-        val = cx22702_readreg (state, 0x03);
+        switch ((val & 0x0c) >> 2) {
-        switch( (val&0x0c)>>2 ) {
+        case 0:
-                case 0: p->guard_interval = GUARD_INTERVAL_1_32; break;
+                p->guard_interval = GUARD_INTERVAL_1_32;
-                case 1: p->guard_interval = GUARD_INTERVAL_1_16; break;
+                break;
-                case 2: p->guard_interval =  GUARD_INTERVAL_1_8; break;
+        case 1:
-                case 3: p->guard_interval =  GUARD_INTERVAL_1_4; break;
+                p->guard_interval = GUARD_INTERVAL_1_16;
+                break;
+        case 2:
+                p->guard_interval = GUARD_INTERVAL_1_8;
+                break;
+        case 3:
+                p->guard_interval = GUARD_INTERVAL_1_4;
+                break;
        }
-        switch( val&0x03 ) {
+        switch (val & 0x03) {
-                case 0: p->transmission_mode = TRANSMISSION_MODE_2K; break;
+        case 0:
-                case 1: p->transmission_mode = TRANSMISSION_MODE_8K; break;
+                p->transmission_mode = TRANSMISSION_MODE_2K;
+                break;
+        case 1:
+                p->transmission_mode = TRANSMISSION_MODE_8K;
+                break;
        }
        return 0;
 }
-static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+static int cx22702_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
-        dprintk ("%s(%d)\n", __func__, enable);
+        dprintk("%s(%d)\n", __func__, enable);
        if (enable)
-                return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe);
+                return cx22702_writereg(state, 0x0D,
+                        cx22702_readreg(state, 0x0D) & 0xfe);
        else
-                return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) | 1);
+                return cx22702_writereg(state, 0x0D,
+                        cx22702_readreg(state, 0x0D) | 1);
 }
 /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
-static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx22702_set_tps(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
 {
        u8 val;
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
        if (fe->ops.tuner_ops.set_params) {
                fe->ops.tuner_ops.set_params(fe, p);
-                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
        }
        /* set inversion */
-        cx22702_set_inversion (state, p->inversion);
+        cx22702_set_inversion(state, p->inversion);
        /* set bandwidth */
-        switch(p->u.ofdm.bandwidth) {
+        switch (p->u.ofdm.bandwidth) {
        case BANDWIDTH_6_MHZ:
-                cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xcf) | 0x20 );
+                cx22702_writereg(state, 0x0C,
+                        (cx22702_readreg(state, 0x0C) & 0xcf) | 0x20);
                break;
        case BANDWIDTH_7_MHZ:
-                cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xcf) | 0x10 );
+                cx22702_writereg(state, 0x0C,
+                        (cx22702_readreg(state, 0x0C) & 0xcf) | 0x10);
                break;
        case BANDWIDTH_8_MHZ:
-                cx22702_writereg(state, 0x0C, cx22702_readreg(state, 0x0C) &0xcf );
+                cx22702_writereg(state, 0x0C,
+                        cx22702_readreg(state, 0x0C) & 0xcf);
                break;
        default:
-                dprintk ("%s: invalid bandwidth\n",__func__);
+                dprintk("%s: invalid bandwidth\n", __func__);
                return -EINVAL;
        }
+        p->u.ofdm.code_rate_LP = FEC_AUTO; /* temp hack as manual not working */
-        p->u.ofdm.code_rate_LP = FEC_AUTO; //temp hack as manual not working
        /* use auto configuration? */
-        if((p->u.ofdm.hierarchy_information==HIERARCHY_AUTO) ||
+        if ((p->u.ofdm.hierarchy_information == HIERARCHY_AUTO) ||
-           (p->u.ofdm.constellation==QAM_AUTO) ||
+           (p->u.ofdm.constellation == QAM_AUTO) ||
-           (p->u.ofdm.code_rate_HP==FEC_AUTO) ||
+           (p->u.ofdm.code_rate_HP == FEC_AUTO) ||
-           (p->u.ofdm.code_rate_LP==FEC_AUTO) ||
+           (p->u.ofdm.code_rate_LP == FEC_AUTO) ||
-           (p->u.ofdm.guard_interval==GUARD_INTERVAL_AUTO) ||
+           (p->u.ofdm.guard_interval == GUARD_INTERVAL_AUTO) ||
-           (p->u.ofdm.transmission_mode==TRANSMISSION_MODE_AUTO) ) {
+           (p->u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO)) {
                /* TPS Source - use hardware driven values */
                cx22702_writereg(state, 0x06, 0x10);
                cx22702_writereg(state, 0x07, 0x9);
                cx22702_writereg(state, 0x08, 0xC1);
-                cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc );
+                cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B)
-                cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );
+                        & 0xfc);
+                cx22702_writereg(state, 0x0C,
+                        (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
                cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */
-                dprintk("%s: Autodetecting\n",__func__);
+                dprintk("%s: Autodetecting\n", __func__);
                return 0;
        }
        /* manually programmed values */
-        val=0;
+        val = 0;
-        switch(p->u.ofdm.constellation) {
+        switch (p->u.ofdm.constellation) {
-                case   QPSK: val = (val&0xe7); break;
+        case QPSK:
-                case QAM_16: val = (val&0xe7)|0x08; break;
+                val = (val & 0xe7);
-                case QAM_64: val = (val&0xe7)|0x10; break;
+                break;
-                default:
+        case QAM_16:
-                        dprintk ("%s: invalid constellation\n",__func__);
+                val = (val & 0xe7) | 0x08;
-                        return -EINVAL;
+                break;
+        case QAM_64:
+                val = (val & 0xe7) | 0x10;
+                break;
+        default:
+                dprintk("%s: invalid constellation\n", __func__);
+                return -EINVAL;
        }
-        switch(p->u.ofdm.hierarchy_information) {
+        switch (p->u.ofdm.hierarchy_information) {
-                case HIERARCHY_NONE: val = (val&0xf8); break;
+        case HIERARCHY_NONE:
-                case    HIERARCHY_1: val = (val&0xf8)|1; break;
+                val = (val & 0xf8);
-                case    HIERARCHY_2: val = (val&0xf8)|2; break;
+                break;
-                case    HIERARCHY_4: val = (val&0xf8)|3; break;
+        case HIERARCHY_1:
-                default:
+                val = (val & 0xf8) | 1;
-                        dprintk ("%s: invalid hierarchy\n",__func__);
+                break;
-                        return -EINVAL;
+        case HIERARCHY_2:
+                val = (val & 0xf8) | 2;
+                break;
+        case HIERARCHY_4:
+                val = (val & 0xf8) | 3;
+                break;
+        default:
+                dprintk("%s: invalid hierarchy\n", __func__);
+                return -EINVAL;
        }
-        cx22702_writereg (state, 0x06, val);
+        cx22702_writereg(state, 0x06, val);
-        val=0;
+        val = 0;
-        switch(p->u.ofdm.code_rate_HP) {
+        switch (p->u.ofdm.code_rate_HP) {
-                case FEC_NONE:
+        case FEC_NONE:
-                case FEC_1_2: val = (val&0xc7); break;
+        case FEC_1_2:
-                case FEC_2_3: val = (val&0xc7)|0x08; break;
+                val = (val & 0xc7);
-                case FEC_3_4: val = (val&0xc7)|0x10; break;
+                break;
-                case FEC_5_6: val = (val&0xc7)|0x18; break;
+        case FEC_2_3:
-                case FEC_7_8: val = (val&0xc7)|0x20; break;
+                val = (val & 0xc7) | 0x08;
-                default:
+                break;
-                        dprintk ("%s: invalid code_rate_HP\n",__func__);
+        case FEC_3_4:
-                        return -EINVAL;
+                val = (val & 0xc7) | 0x10;
+                break;
+        case FEC_5_6:
+                val = (val & 0xc7) | 0x18;
+                break;
+        case FEC_7_8:
+                val = (val & 0xc7) | 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) {
-                case FEC_NONE:
+        case FEC_NONE:
-                case FEC_1_2: val = (val&0xf8); break;
+        case FEC_1_2:
-                case FEC_2_3: val = (val&0xf8)|1; break;
+                val = (val & 0xf8);
-                case FEC_3_4: val = (val&0xf8)|2; break;
+                break;
-                case FEC_5_6: val = (val&0xf8)|3; break;
+        case FEC_2_3:
-                case FEC_7_8: val = (val&0xf8)|4; break;
+                val = (val & 0xf8) | 1;
-                default:
+                break;
-                        dprintk ("%s: invalid code_rate_LP\n",__func__);
+        case FEC_3_4:
-                        return -EINVAL;
+                val = (val & 0xf8) | 2;
+                break;
+        case FEC_5_6:
+                val = (val & 0xf8) | 3;
+                break;
+        case FEC_7_8:
+                val = (val & 0xf8) | 4;
+                break;
+        default:
+                dprintk("%s: invalid code_rate_LP\n", __func__);
+                return -EINVAL;
        }
-        cx22702_writereg (state, 0x07, val);
+        cx22702_writereg(state, 0x07, val);
-        val=0;
+        val = 0;
-        switch(p->u.ofdm.guard_interval) {
+        switch (p->u.ofdm.guard_interval) {
-                case GUARD_INTERVAL_1_32: val = (val&0xf3); break;
+        case GUARD_INTERVAL_1_32:
-                case GUARD_INTERVAL_1_16: val = (val&0xf3)|0x04; break;
+                val = (val & 0xf3);
-                case  GUARD_INTERVAL_1_8: val = (val&0xf3)|0x08; break;
+                break;
-                case  GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break;
+        case GUARD_INTERVAL_1_16:
-                default:
+                val = (val & 0xf3) | 0x04;
-                        dprintk ("%s: invalid guard_interval\n",__func__);
+                break;
-                        return -EINVAL;
+        case GUARD_INTERVAL_1_8:
+                val = (val & 0xf3) | 0x08;
+                break;
+        case GUARD_INTERVAL_1_4:
+                val = (val & 0xf3) | 0x0c;
+                break;
+        default:
+                dprintk("%s: invalid guard_interval\n", __func__);
+                return -EINVAL;
        }
-        switch(p->u.ofdm.transmission_mode) {
+        switch (p->u.ofdm.transmission_mode) {
-                case TRANSMISSION_MODE_2K: val = (val&0xfc); break;
+        case TRANSMISSION_MODE_2K:
-                case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break;
+                val = (val & 0xfc);
-                default:
+                break;
-                        dprintk ("%s: invalid transmission_mode\n",__func__);
+        case TRANSMISSION_MODE_8K:
-                        return -EINVAL;
+                val = (val & 0xfc) | 1;
+                break;
+        default:
+                dprintk("%s: invalid transmission_mode\n", __func__);
+                return -EINVAL;
        }
        cx22702_writereg(state, 0x08, val);
-        cx22702_writereg(state, 0x0B, (cx22702_readreg(state, 0x0B) & 0xfc) | 0x02 );
+        cx22702_writereg(state, 0x0B,
-        cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );
+                (cx22702_readreg(state, 0x0B) & 0xfc) | 0x02);
+        cx22702_writereg(state, 0x0C,
+                (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
        /* Begin channel aquisition */
        cx22702_writereg(state, 0x00, 0x01);
@@ -329,109 +434,111 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
 /* Reset the demod hardware and reset all of the configuration registers
   to a default state. */
-static int cx22702_init (struct dvb_frontend* fe)
+static int cx22702_init(struct dvb_frontend *fe)
 {
        int i;
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
-        cx22702_writereg (state, 0x00, 0x02);
+        cx22702_writereg(state, 0x00, 0x02);
        msleep(10);
-        for (i=0; i<sizeof(init_tab); i+=2)
+        for (i = 0; i < ARRAY_SIZE(init_tab); i += 2)
-                cx22702_writereg (state, init_tab[i], init_tab[i+1]);
+                cx22702_writereg(state, init_tab[i], init_tab[i + 1]);
-        cx22702_writereg (state, 0xf8, (state->config->output_mode << 1) & 0x02);
+        cx22702_writereg(state, 0xf8, (state->config->output_mode << 1)
+                & 0x02);
        cx22702_i2c_gate_ctrl(fe, 0);
        return 0;
 }
-static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int cx22702_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
        u8 reg0A;
        u8 reg23;
        *status = 0;
-        reg0A = cx22702_readreg (state, 0x0A);
+        reg0A = cx22702_readreg(state, 0x0A);
-        reg23 = cx22702_readreg (state, 0x23);
+        reg23 = cx22702_readreg(state, 0x23);
-        dprintk ("%s: status demod=0x%02x agc=0x%02x\n"
+        dprintk("%s: status demod=0x%02x agc=0x%02x\n"
-                ,__func__,reg0A,reg23);
+                , __func__, reg0A, reg23);
-        if(reg0A & 0x10) {
+        if (reg0A & 0x10) {
                *status |= FE_HAS_LOCK;
                *status |= FE_HAS_VITERBI;
                *status |= FE_HAS_SYNC;
        }
-        if(reg0A & 0x20)
+        if (reg0A & 0x20)
                *status |= FE_HAS_CARRIER;
-        if(reg23 < 0xf0)
+        if (reg23 < 0xf0)
                *status |= FE_HAS_SIGNAL;
        return 0;
 }
-static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber)
+static int cx22702_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
-        if(cx22702_readreg (state, 0xE4) & 0x02) {
+        if (cx22702_readreg(state, 0xE4) & 0x02) {
                /* Realtime statistics */
-                *ber = (cx22702_readreg (state, 0xDE) & 0x7F) << 7
+                *ber = (cx22702_readreg(state, 0xDE) & 0x7F) << 7
-                        | (cx22702_readreg (state, 0xDF)&0x7F);
+                        | (cx22702_readreg(state, 0xDF) & 0x7F);
        } else {
                /* Averagtine statistics */
-                *ber = (cx22702_readreg (state, 0xDE) & 0x7F) << 7
+                *ber = (cx22702_readreg(state, 0xDE) & 0x7F) << 7
-                        | cx22702_readreg (state, 0xDF);
+                        | cx22702_readreg(state, 0xDF);
        }
        return 0;
 }
-static int cx22702_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
+static int cx22702_read_signal_strength(struct dvb_frontend *fe,
+        u16 *signal_strength)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
        u16 rs_ber = 0;
-        rs_ber = cx22702_readreg (state, 0x23);
+        rs_ber = cx22702_readreg(state, 0x23);
        *signal_strength = (rs_ber << 8) | rs_ber;
        return 0;
 }
-static int cx22702_read_snr(struct dvb_frontend* fe, u16* snr)
+static int cx22702_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
-        u16 rs_ber=0;
+        u16 rs_ber = 0;
-        if(cx22702_readreg (state, 0xE4) & 0x02) {
+        if (cx22702_readreg(state, 0xE4) & 0x02) {
                /* Realtime statistics */
-                rs_ber = (cx22702_readreg (state, 0xDE) & 0x7F) << 7
+                rs_ber = (cx22702_readreg(state, 0xDE) & 0x7F) << 7
-                        | (cx22702_readreg (state, 0xDF)& 0x7F);
+                        | (cx22702_readreg(state, 0xDF) & 0x7F);
        } else {
                /* Averagine statistics */
-                rs_ber = (cx22702_readreg (state, 0xDE) & 0x7F) << 8
+                rs_ber = (cx22702_readreg(state, 0xDE) & 0x7F) << 8
-                        | cx22702_readreg (state, 0xDF);
+                        | cx22702_readreg(state, 0xDF);
        }
        *snr = ~rs_ber;
        return 0;
 }
-static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
+static int cx22702_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
        u8 _ucblocks;
        /* RS Uncorrectable Packet Count then reset */
-        _ucblocks = cx22702_readreg (state, 0xE3);
+        _ucblocks = cx22702_readreg(state, 0xE3);
        if (state->prevUCBlocks < _ucblocks)
                *ucblocks = (_ucblocks - state->prevUCBlocks);
        else
@@ -441,34 +548,36 @@ static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
        return 0;
 }
-static int cx22702_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx22702_get_frontend(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
-        u8 reg0C = cx22702_readreg (state, 0x0C);
+        u8 reg0C = cx22702_readreg(state, 0x0C);
        p->inversion = reg0C & 0x1 ? INVERSION_ON : INVERSION_OFF;
-        return cx22702_get_tps (state, &p->u.ofdm);
+        return cx22702_get_tps(state, &p->u.ofdm);
 }
-static int cx22702_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
+static int cx22702_get_tune_settings(struct dvb_frontend *fe,
+        struct dvb_frontend_tune_settings *tune)
 {
        tune->min_delay_ms = 1000;
        return 0;
 }
-static void cx22702_release(struct dvb_frontend* fe)
+static void cx22702_release(struct dvb_frontend *fe)
 {
-        struct cx22702_state* state = fe->demodulator_priv;
+        struct cx22702_state *state = fe->demodulator_priv;
        kfree(state);
 }
 static struct dvb_frontend_ops cx22702_ops;
-struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
+struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,
-                                    struct i2c_adapter* i2c)
+        struct i2c_adapter *i2c)
 {
-        struct cx22702_state* state = NULL;
+        struct cx22702_state *state = NULL;
        /* allocate memory for the internal state */
        state = kmalloc(sizeof(struct cx22702_state), GFP_KERNEL);
@@ -485,7 +594,8 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
                goto error;
        /* create dvb_frontend */
-        memcpy(&state->frontend.ops, &cx22702_ops, sizeof(struct dvb_frontend_ops));
+        memcpy(&state->frontend.ops, &cx22702_ops,
+                sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
        return &state->frontend;
@@ -493,6 +603,7 @@ error:
        kfree(state);
        return NULL;
 }
+EXPORT_SYMBOL(cx22702_attach);
 static struct dvb_frontend_ops cx22702_ops = {
@@ -525,11 +636,6 @@ static struct dvb_frontend_ops cx22702_ops = {
        .read_ucblocks = cx22702_read_ucblocks,
 };
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 MODULE_DESCRIPTION("Conexant CX22702 DVB-T Demodulator driver");
 MODULE_AUTHOR("Steven Toth");
 MODULE_LICENSE("GPL");
-EXPORT_SYMBOL(cx22702_attach);
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h
index b1e465c6c2ce..f154e1f428eb 100644
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
@@ -30,8 +30,7 @@
 #include <linux/dvb/frontend.h>
-struct cx22702_config
+struct cx22702_config {
-{
        /* the demodulator's i2c address */
        u8 demod_address;
@@ -41,16 +40,19 @@ struct cx22702_config
        u8 output_mode;
 };
-#if defined(CONFIG_DVB_CX22702) || (defined(CONFIG_DVB_CX22702_MODULE) && defined(MODULE))
+#if defined(CONFIG_DVB_CX22702) || (defined(CONFIG_DVB_CX22702_MODULE) \
-extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
+        && defined(MODULE))
-                                           struct i2c_adapter* i2c);
+extern struct dvb_frontend *cx22702_attach(
+        const struct cx22702_config *config,
+        struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
+static inline struct dvb_frontend *cx22702_attach(
-                                           struct i2c_adapter* i2c)
+        const struct cx22702_config *config,
+        struct i2c_adapter *i2c)
 {
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
-#endif // CONFIG_DVB_CX22702
+#endif
-#endif // CX22702_H
+#endif
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index deb36f469ada..b144b308a4dd 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -41,10 +41,14 @@
 #include "dvb_frontend.h"
 #include "cx24116.h"
-static int debug = 0;
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
 #define dprintk(args...) \
        do { \
-                if (debug) printk ("cx24116: " args); \
+                if (debug) \
+                        printk(KERN_INFO "cx24116: " args); \
        } while (0)
 #define CX24116_DEFAULT_FIRMWARE "dvb-fe-cx24116.fw"
@@ -68,13 +72,20 @@ static int debug = 0;
 #define CX24116_REG_UCB8    (0xca)
 #define CX24116_REG_CLKDIV  (0xf3)
 #define CX24116_REG_RATEDIV (0xf9)
-#define CX24116_REG_FECSTATUS (0x9c)    /* configured fec (not tuned) or actual FEC (tuned) 1=1/2 2=2/3 etc */
+/* configured fec (not tuned) or actual FEC (tuned) 1=1/2 2=2/3 etc */
+#define CX24116_REG_FECSTATUS (0x9c)
 /* FECSTATUS bits */
-#define CX24116_FEC_FECMASK   (0x1f)    /* mask to determine configured fec (not tuned) or actual fec (tuned) */
+/* mask to determine configured fec (not tuned) or actual fec (tuned) */
-#define CX24116_FEC_DVBS      (0x20)    /* Select DVB-S demodulator, else DVB-S2 */
+#define CX24116_FEC_FECMASK   (0x1f)
+/* Select DVB-S demodulator, else DVB-S2 */
+#define CX24116_FEC_DVBS      (0x20)
 #define CX24116_FEC_UNKNOWN   (0x40)    /* Unknown/unused */
-#define CX24116_FEC_PILOT     (0x80)    /* Pilot mode requested when tuning else always reset when tuned */
+/* Pilot mode requested when tuning else always reset when tuned */
+#define CX24116_FEC_PILOT     (0x80)
 /* arg buffer size */
 #define CX24116_ARGLEN (0x1e)
@@ -116,12 +127,17 @@ static int debug = 0;
 /* DiSEqC tone burst */
 static int toneburst = 1;
+module_param(toneburst, int, 0644);
+MODULE_PARM_DESC(toneburst, "DiSEqC toneburst 0=OFF, 1=TONE CACHE, "\
+        "2=MESSAGE CACHE (default:1)");
 /* SNR measurements */
-static int esno_snr = 0;
+static int esno_snr;
+module_param(esno_snr, int, 0644);
+MODULE_PARM_DESC(debug, "SNR return units, 0=PERCENTAGE 0-100, "\
+        "1=ESNO(db * 10) (default:0)");
-enum cmds
+enum cmds {
-{
        CMD_SET_VCO     = 0x10,
        CMD_TUNEREQUEST = 0x11,
        CMD_MPEGCONFIG  = 0x13,
@@ -138,8 +154,7 @@ enum cmds
 };
 /* The Demod/Tuner can't easily provide these, we cache them */
-struct cx24116_tuning
+struct cx24116_tuning {
-{
        u32 frequency;
        u32 symbol_rate;
        fe_spectral_inversion_t inversion;
@@ -158,16 +173,14 @@ struct cx24116_tuning
 };
 /* Basic commands that are sent to the firmware */
-struct cx24116_cmd
+struct cx24116_cmd {
-{
        u8 len;
        u8 args[CX24116_ARGLEN];
 };
-struct cx24116_state
+struct cx24116_state {
-{
+        struct i2c_adapter *i2c;
-        struct i2c_adapter* i2c;
+        const struct cx24116_config *config;
-        const struct cx24116_config* config;
        struct dvb_frontend frontend;
@@ -179,19 +192,20 @@ struct cx24116_state
        struct cx24116_cmd dsec_cmd;
 };
-static int cx24116_writereg(struct cx24116_state* state, int reg, int data)
+static int cx24116_writereg(struct cx24116_state *state, int reg, int data)
 {
        u8 buf[] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address,
                .flags = 0, .buf = buf, .len = 2 };
        int err;
-        if (debug>1)
+        if (debug > 1)
                printk("cx24116: %s: write reg 0x%02x, value 0x%02x\n",
-                                                __func__,reg, data);
+                        __func__, reg, data);
-        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+        err = i2c_transfer(state->i2c, &msg, 1);
-                printk("%s: writereg error(err == %i, reg == 0x%02x,"
+        if (err != 1) {
+                printk(KERN_ERR "%s: writereg error(err == %i, reg == 0x%02x,"
                         " value == 0x%02x)\n", __func__, err, reg, data);
                return -EREMOTEIO;
        }
@@ -200,7 +214,8 @@ static int cx24116_writereg(struct cx24116_state* state, int reg, int data)
 }
 /* Bulk byte writes to a single I2C address, for 32k firmware load */
-static int cx24116_writeregN(struct cx24116_state* state, int reg, u8 *data, u16 len)
+static int cx24116_writeregN(struct cx24116_state *state, int reg,
+                             const u8 *data, u16 len)
 {
        int ret = -EREMOTEIO;
        struct i2c_msg msg;
@@ -221,12 +236,13 @@ static int cx24116_writeregN(struct cx24116_state* state, int reg, u8 *data, u16
        msg.buf = buf;
        msg.len = len + 1;
-        if (debug>1)
+        if (debug > 1)
-                printk("cx24116: %s:  write regN 0x%02x, len = %d\n",
+                printk(KERN_INFO "cx24116: %s:  write regN 0x%02x, len = %d\n",
-                                                __func__,reg, len);
+                        __func__, reg, len);
-        if ((ret = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+        ret = i2c_transfer(state->i2c, &msg, 1);
-                printk("%s: writereg error(err == %i, reg == 0x%02x\n",
+        if (ret != 1) {
+                printk(KERN_ERR "%s: writereg error(err == %i, reg == 0x%02x\n",
                         __func__, ret, reg);
                ret = -EREMOTEIO;
        }
@@ -237,30 +253,35 @@ error:
        return ret;
 }
-static int cx24116_readreg(struct cx24116_state* state, u8 reg)
+static int cx24116_readreg(struct cx24116_state *state, u8 reg)
 {
        int ret;
        u8 b0[] = { reg };
        u8 b1[] = { 0 };
        struct i2c_msg msg[] = {
-                { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
+                { .addr = state->config->demod_address, .flags = 0,
-                { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 }
+                        .buf = b0, .len = 1 },
+                { .addr = state->config->demod_address, .flags = I2C_M_RD,
+                        .buf = b1, .len = 1 }
        };
        ret = i2c_transfer(state->i2c, msg, 2);
        if (ret != 2) {
-                printk("%s: reg=0x%x (error=%d)\n", __func__, reg, ret);
+                printk(KERN_ERR "%s: reg=0x%x (error=%d)\n",
+                        __func__, reg, ret);
                return ret;
        }
-        if (debug>1)
+        if (debug > 1)
-                printk("cx24116: read reg 0x%02x, value 0x%02x\n",reg, b1[0]);
+                printk(KERN_INFO "cx24116: read reg 0x%02x, value 0x%02x\n",
+                        reg, b1[0]);
        return b1[0];
 }
-static int cx24116_set_inversion(struct cx24116_state* state, fe_spectral_inversion_t inversion)
+static int cx24116_set_inversion(struct cx24116_state *state,
+        fe_spectral_inversion_t inversion)
 {
        dprintk("%s(%d)\n", __func__, inversion);
@@ -308,10 +329,10 @@ static int cx24116_set_inversion(struct cx24116_state* state, fe_spectral_invers
 * Eg.(2/3) szap "Zone Horror"
 *
 * mask/val = 0x04, 0x20
- * status 1f | signal c3c0 | snr a333 | ber 00000098 | unc 00000000 | FE_HAS_LOCK
+ * status 1f | signal c3c0 | snr a333 | ber 00000098 | unc 0 | FE_HAS_LOCK
 *
 * mask/val = 0x04, 0x30
- * status 1f | signal c3c0 | snr a333 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
+ * status 1f | signal c3c0 | snr a333 | ber 00000000 | unc 0 | FE_HAS_LOCK
 *
 * After tuning FECSTATUS contains actual FEC
 * in use numbered 1 through to 8 for 1/2 .. 2/3 etc
@@ -389,18 +410,16 @@ struct cx24116_modfec {
  */
 };
-static int cx24116_lookup_fecmod(struct cx24116_state* state,
+static int cx24116_lookup_fecmod(struct cx24116_state *state,
        fe_modulation_t m, fe_code_rate_t f)
 {
        int i, ret = -EOPNOTSUPP;
        dprintk("%s(0x%02x,0x%02x)\n", __func__, m, f);
-        for(i=0 ; i < sizeof(CX24116_MODFEC_MODES) / sizeof(struct cx24116_modfec) ; i++)
+        for (i = 0; i < ARRAY_SIZE(CX24116_MODFEC_MODES); i++) {
-        {
+                if ((m == CX24116_MODFEC_MODES[i].modulation) &&
-                if( (m == CX24116_MODFEC_MODES[i].modulation) &&
+                        (f == CX24116_MODFEC_MODES[i].fec)) {
-                        (f == CX24116_MODFEC_MODES[i].fec) )
-                        {
                                ret = i;
                                break;
                        }
@@ -409,7 +428,8 @@ static int cx24116_lookup_fecmod(struct cx24116_state* state,
        return ret;
 }
-static int cx24116_set_fec(struct cx24116_state* state, fe_modulation_t mod, fe_code_rate_t fec)
+static int cx24116_set_fec(struct cx24116_state *state,
+        fe_modulation_t mod, fe_code_rate_t fec)
 {
        int ret = 0;
@@ -417,7 +437,7 @@ static int cx24116_set_fec(struct cx24116_state* state, fe_modulation_t mod, fe_
        ret = cx24116_lookup_fecmod(state, mod, fec);
-        if(ret < 0)
+        if (ret < 0)
                return ret;
        state->dnxt.fec = fec;
@@ -429,7 +449,7 @@ static int cx24116_set_fec(struct cx24116_state* state, fe_modulation_t mod, fe_
        return 0;
 }
-static int cx24116_set_symbolrate(struct cx24116_state* state, u32 rate)
+static int cx24116_set_symbolrate(struct cx24116_state *state, u32 rate)
 {
        dprintk("%s(%d)\n", __func__, rate);
@@ -446,42 +466,49 @@ static int cx24116_set_symbolrate(struct cx24116_state* state, u32 rate)
        return 0;
 }
-static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware *fw);
+static int cx24116_load_firmware(struct dvb_frontend *fe,
+        const struct firmware *fw);
-static int cx24116_firmware_ondemand(struct dvb_frontend* fe)
+static int cx24116_firmware_ondemand(struct dvb_frontend *fe)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        const struct firmware *fw;
        int ret = 0;
-        dprintk("%s()\n",__func__);
+        dprintk("%s()\n", __func__);
-        if (cx24116_readreg(state, 0x20) > 0)
+        if (cx24116_readreg(state, 0x20) > 0) {
-        {
                if (state->skip_fw_load)
                        return 0;
                /* Load firmware */
-                /* request the firmware, this will block until someone uploads it */
+                /* request the firmware, this will block until loaded */
-                printk("%s: Waiting for firmware upload (%s)...\n", __func__, CX24116_DEFAULT_FIRMWARE);
+                printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n",
-                ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE, &state->i2c->dev);
+                        __func__, CX24116_DEFAULT_FIRMWARE);
-                printk("%s: Waiting for firmware upload(2)...\n", __func__);
+                ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE,
+                        &state->i2c->dev);
+                printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n",
+                        __func__);
                if (ret) {
-                        printk("%s: No firmware uploaded (timeout or file not found?)\n", __func__);
+                        printk(KERN_ERR "%s: No firmware uploaded "
+                                "(timeout or file not found?)\n", __func__);
                        return ret;
                }
-                /* Make sure we don't recurse back through here during loading */
+                /* Make sure we don't recurse back through here
+                 * during loading */
                state->skip_fw_load = 1;
                ret = cx24116_load_firmware(fe, fw);
                if (ret)
-                        printk("%s: Writing firmware to device failed\n", __func__);
+                        printk(KERN_ERR "%s: Writing firmware to device failed\n",
+                                __func__);
                release_firmware(fw);
-                printk("%s: Firmware upload %s\n", __func__, ret == 0 ? "complete" : "failed");
+                printk(KERN_INFO "%s: Firmware upload %s\n", __func__,
+                        ret == 0 ? "complete" : "failed");
                /* Ensure firmware is always loaded if required */
                state->skip_fw_load = 0;
@@ -490,8 +517,10 @@ static int cx24116_firmware_ondemand(struct dvb_frontend* fe)
        return ret;
 }
-/* Take a basic firmware command structure, format it and forward it for processing */
+/* Take a basic firmware command structure, format it
-static int cx24116_cmd_execute(struct dvb_frontend* fe, struct cx24116_cmd *cmd)
+ * and forward it for processing
+ */
+static int cx24116_cmd_execute(struct dvb_frontend *fe, struct cx24116_cmd *cmd)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        int i, ret;
@@ -499,49 +528,49 @@ static int cx24116_cmd_execute(struct dvb_frontend* fe, struct cx24116_cmd *cmd)
        dprintk("%s()\n", __func__);
        /* Load the firmware if required */
-        if ( (ret = cx24116_firmware_ondemand(fe)) != 0)
+        ret = cx24116_firmware_ondemand(fe);
-        {
+        if (ret != 0) {
-                printk("%s(): Unable initialise the firmware\n", __func__);
+                printk(KERN_ERR "%s(): Unable initialise the firmware\n",
+                        __func__);
                return ret;
        }
        /* Write the command */
-        for(i = 0; i < cmd->len ; i++)
+        for (i = 0; i < cmd->len ; i++) {
-        {
                dprintk("%s: 0x%02x == 0x%02x\n", __func__, i, cmd->args[i]);
                cx24116_writereg(state, i, cmd->args[i]);
        }
        /* Start execution and wait for cmd to terminate */
        cx24116_writereg(state, CX24116_REG_EXECUTE, 0x01);
-        while( cx24116_readreg(state, CX24116_REG_EXECUTE) )
+        while (cx24116_readreg(state, CX24116_REG_EXECUTE)) {
-        {
                msleep(10);
-                if(i++ > 64)
+                if (i++ > 64) {
-                {
+                        /* Avoid looping forever if the firmware does
-                        /* Avoid looping forever if the firmware does no respond */
+                                not respond */
-                        printk("%s() Firmware not responding\n", __func__);
+                        printk(KERN_WARNING "%s() Firmware not responding\n",
+                                __func__);
                        return -EREMOTEIO;
                }
        }
        return 0;
 }
-static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
+static int cx24116_load_firmware(struct dvb_frontend *fe,
+        const struct firmware *fw)
 {
-        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_state *state = fe->demodulator_priv;
        struct cx24116_cmd cmd;
        int i, ret;
        unsigned char vers[4];
        dprintk("%s\n", __func__);
-        dprintk("Firmware is %zu bytes (%02x %02x .. %02x %02x)\n"
+        dprintk("Firmware is %zu bytes (%02x %02x .. %02x %02x)\n",
-                        ,fw->size
+                        fw->size,
-                        ,fw->data[0]
+                        fw->data[0],
-                        ,fw->data[1]
+                        fw->data[1],
-                        ,fw->data[ fw->size-2 ]
+                        fw->data[fw->size-2],
-                        ,fw->data[ fw->size-1 ]
+                        fw->data[fw->size-1]);
-                        );
        /* Toggle 88x SRST pin to reset demod */
        if (state->config->reset_device)
@@ -587,7 +616,7 @@ static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware
        cmd.args[0x07] = 0x9d;
        cmd.args[0x08] = 0xfc;
        cmd.args[0x09] = 0x06;
-        cmd.len= 0x0a;
+        cmd.len = 0x0a;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
@@ -598,7 +627,7 @@ static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware
        cmd.args[0x00] = CMD_TUNERINIT;
        cmd.args[0x01] = 0x00;
        cmd.args[0x02] = 0x00;
-        cmd.len= 0x03;
+        cmd.len = 0x03;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
@@ -615,36 +644,38 @@ static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware
        else
                cmd.args[0x04] = 0x02;
        cmd.args[0x05] = 0x00;
-        cmd.len= 0x06;
+        cmd.len = 0x06;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
        /* Firmware CMD 35: Get firmware version */
        cmd.args[0x00] = CMD_UPDFWVERS;
-        cmd.len= 0x02;
+        cmd.len = 0x02;
-        for(i=0; i<4; i++) {
+        for (i = 0; i < 4; i++) {
                cmd.args[0x01] = i;
                ret = cx24116_cmd_execute(fe, &cmd);
                if (ret != 0)
                        return ret;
-                vers[i]= cx24116_readreg(state, CX24116_REG_MAILBOX);
+                vers[i] = cx24116_readreg(state, CX24116_REG_MAILBOX);
        }
-        printk("%s: FW version %i.%i.%i.%i\n", __func__,
+        printk(KERN_INFO "%s: FW version %i.%i.%i.%i\n", __func__,
                vers[0], vers[1], vers[2], vers[3]);
        return 0;
 }
-static int cx24116_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+static int cx24116_set_voltage(struct dvb_frontend *fe,
+        fe_sec_voltage_t voltage)
 {
        /* The isl6421 module will override this function in the fops. */
-        dprintk("%s() This should never appear if the isl6421 module is loaded correctly\n",__func__);
+        dprintk("%s() This should never appear if the isl6421 module "
+                "is loaded correctly\n", __func__);
        return -EOPNOTSUPP;
 }
-static int cx24116_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int cx24116_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
        struct cx24116_state *state = fe->demodulator_priv;
@@ -666,22 +697,23 @@ static int cx24116_read_status(struct dvb_frontend* fe, fe_status_t* status)
        return 0;
 }
-static int cx24116_read_ber(struct dvb_frontend* fe, u32* ber)
+static int cx24116_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        dprintk("%s()\n", __func__);
-        *ber =  ( cx24116_readreg(state, CX24116_REG_BER24) << 24 ) |
+        *ber =  (cx24116_readreg(state, CX24116_REG_BER24) << 24) |
-                ( cx24116_readreg(state, CX24116_REG_BER16) << 16 ) |
+                (cx24116_readreg(state, CX24116_REG_BER16) << 16) |
-                ( cx24116_readreg(state, CX24116_REG_BER8 ) << 8  ) |
+                (cx24116_readreg(state, CX24116_REG_BER8)  << 8)  |
-                  cx24116_readreg(state, CX24116_REG_BER0 );
+                 cx24116_readreg(state, CX24116_REG_BER0);
        return 0;
 }
 /* TODO Determine function and scale appropriately */
-static int cx24116_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
+static int cx24116_read_signal_strength(struct dvb_frontend *fe,
+        u16 *signal_strength)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        struct cx24116_cmd cmd;
@@ -692,39 +724,43 @@ static int cx24116_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
        /* Firmware CMD 19: Get AGC */
        cmd.args[0x00] = CMD_GETAGC;
-        cmd.len= 0x01;
+        cmd.len = 0x01;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
-        sig_reading = ( cx24116_readreg(state, CX24116_REG_SSTATUS) & CX24116_SIGNAL_MASK ) |
+        sig_reading =
-                ( cx24116_readreg(state, CX24116_REG_SIGNAL) << 6 );
+                (cx24116_readreg(state,
-        *signal_strength= 0 - sig_reading;
+                        CX24116_REG_SSTATUS) & CX24116_SIGNAL_MASK) |
+                (cx24116_readreg(state, CX24116_REG_SIGNAL) << 6);
+        *signal_strength = 0 - sig_reading;
-        dprintk("%s: raw / cooked = 0x%04x / 0x%04x\n", __func__, sig_reading, *signal_strength);
+        dprintk("%s: raw / cooked = 0x%04x / 0x%04x\n",
+                __func__, sig_reading, *signal_strength);
        return 0;
 }
 /* SNR (0..100)% = (sig & 0xf0) * 10 + (sig & 0x0f) * 10 / 16 */
-static int cx24116_read_snr_pct(struct dvb_frontend* fe, u16* snr)
+static int cx24116_read_snr_pct(struct dvb_frontend *fe, u16 *snr)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        u8 snr_reading;
        static const u32 snr_tab[] = { /* 10 x Table (rounded up) */
-                0x00000,0x0199A,0x03333,0x04ccD,0x06667,
+                0x00000, 0x0199A, 0x03333, 0x04ccD, 0x06667,
-                        0x08000,0x0999A,0x0b333,0x0cccD,0x0e667,
+                0x08000, 0x0999A, 0x0b333, 0x0cccD, 0x0e667,
-                0x10000,0x1199A,0x13333,0x14ccD,0x16667,0x18000 };
+                0x10000, 0x1199A, 0x13333, 0x14ccD, 0x16667,
+                0x18000 };
        dprintk("%s()\n", __func__);
        snr_reading = cx24116_readreg(state, CX24116_REG_QUALITY0);
-        if(snr_reading >= 0xa0 /* 100% */)
+        if (snr_reading >= 0xa0 /* 100% */)
                *snr = 0xffff;
        else
-                *snr = snr_tab [ ( snr_reading & 0xf0 )   >> 4 ] +
+                *snr = snr_tab[(snr_reading & 0xf0) >> 4] +
-                        ( snr_tab [ ( snr_reading & 0x0f ) ] >> 4 );
+                        (snr_tab[(snr_reading & 0x0f)] >> 4);
        dprintk("%s: raw / cooked = 0x%02x / 0x%04x\n", __func__,
                snr_reading, *snr);
@@ -736,7 +772,7 @@ static int cx24116_read_snr_pct(struct dvb_frontend* fe, u16* snr)
 * ESNO, from 0->30db (values 0->300). We provide this value by
 * default.
 */
-static int cx24116_read_snr_esno(struct dvb_frontend* fe, u16* snr)
+static int cx24116_read_snr_esno(struct dvb_frontend *fe, u16 *snr)
 {
        struct cx24116_state *state = fe->demodulator_priv;
@@ -750,7 +786,7 @@ static int cx24116_read_snr_esno(struct dvb_frontend* fe, u16* snr)
        return 0;
 }
-static int cx24116_read_snr(struct dvb_frontend* fe, u16* snr)
+static int cx24116_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
        if (esno_snr == 1)
                return cx24116_read_snr_esno(fe, snr);
@@ -758,27 +794,27 @@ static int cx24116_read_snr(struct dvb_frontend* fe, u16* snr)
                return cx24116_read_snr_pct(fe, snr);
 }
-static int cx24116_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
+static int cx24116_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        dprintk("%s()\n", __func__);
-        *ucblocks = ( cx24116_readreg(state, CX24116_REG_UCB8) << 8 ) |
+        *ucblocks = (cx24116_readreg(state, CX24116_REG_UCB8) << 8) |
                cx24116_readreg(state, CX24116_REG_UCB0);
        return 0;
 }
 /* Overwrite the current tuning params, we are about to tune */
-static void cx24116_clone_params(struct dvb_frontend* fe)
+static void cx24116_clone_params(struct dvb_frontend *fe)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        memcpy(&state->dcur, &state->dnxt, sizeof(state->dcur));
 }
 /* Wait for LNB */
-static int cx24116_wait_for_lnb(struct dvb_frontend* fe)
+static int cx24116_wait_for_lnb(struct dvb_frontend *fe)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        int i;
@@ -787,7 +823,7 @@ static int cx24116_wait_for_lnb(struct dvb_frontend* fe)
                cx24116_readreg(state, CX24116_REG_QSTATUS));
        /* Wait for up to 300 ms */
-        for(i = 0; i < 30 ; i++) {
+        for (i = 0; i < 30 ; i++) {
                if (cx24116_readreg(state, CX24116_REG_QSTATUS) & 0x20)
                        return 0;
                msleep(10);
@@ -798,20 +834,21 @@ static int cx24116_wait_for_lnb(struct dvb_frontend* fe)
        return -ETIMEDOUT; /* -EBUSY ? */
 }
-static int cx24116_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+static int cx24116_set_tone(struct dvb_frontend *fe,
+        fe_sec_tone_mode_t tone)
 {
        struct cx24116_cmd cmd;
        int ret;
        dprintk("%s(%d)\n", __func__, tone);
-        if ( (tone != SEC_TONE_ON) && (tone != SEC_TONE_OFF) ) {
+        if ((tone != SEC_TONE_ON) && (tone != SEC_TONE_OFF)) {
-                printk("%s: Invalid, tone=%d\n", __func__, tone);
+                printk(KERN_ERR "%s: Invalid, tone=%d\n", __func__, tone);
                return -EINVAL;
        }
        /* Wait for LNB ready */
        ret = cx24116_wait_for_lnb(fe);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        /* Min delay time after DiSEqC send */
@@ -820,7 +857,7 @@ static int cx24116_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
        /* This is always done before the tone is set */
        cmd.args[0x00] = CMD_SET_TONEPRE;
        cmd.args[0x01] = 0x00;
-        cmd.len= 0x02;
+        cmd.len = 0x02;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
@@ -836,11 +873,11 @@ static int cx24116_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
                cmd.args[0x03] = 0x01;
                break;
        case SEC_TONE_OFF:
-                dprintk("%s: setting tone off\n",__func__);
+                dprintk("%s: setting tone off\n", __func__);
                cmd.args[0x03] = 0x00;
                break;
        }
-        cmd.len= 0x04;
+        cmd.len = 0x04;
        /* Min delay time before DiSEqC send */
        msleep(15); /* XXX determine is FW does this, see send_diseqc/burst */
@@ -849,7 +886,7 @@ static int cx24116_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 }
 /* Initialise DiSEqC */
-static int cx24116_diseqc_init(struct dvb_frontend* fe)
+static int cx24116_diseqc_init(struct dvb_frontend *fe)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        struct cx24116_cmd cmd;
@@ -864,7 +901,7 @@ static int cx24116_diseqc_init(struct dvb_frontend* fe)
        cmd.args[0x05] = 0x28;
        cmd.args[0x06] = (toneburst == CX24116_DISEQC_TONEOFF) ? 0x00 : 0x01;
        cmd.args[0x07] = 0x01;
-        cmd.len= 0x08;
+        cmd.len = 0x08;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
@@ -878,36 +915,38 @@ static int cx24116_diseqc_init(struct dvb_frontend* fe)
        /* Unknown */
        state->dsec_cmd.args[CX24116_DISEQC_ARG2_2] = 0x02;
        state->dsec_cmd.args[CX24116_DISEQC_ARG3_0] = 0x00;
-        state->dsec_cmd.args[CX24116_DISEQC_ARG4_0] = 0x00; /* Continuation flag? */
+        /* Continuation flag? */
+        state->dsec_cmd.args[CX24116_DISEQC_ARG4_0] = 0x00;
        /* DiSEqC message length */
        state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] = 0x00;
        /* Command length */
-        state->dsec_cmd.len= CX24116_DISEQC_MSGOFS;
+        state->dsec_cmd.len = CX24116_DISEQC_MSGOFS;
        return 0;
 }
 /* Send DiSEqC message with derived burst (hack) || previous burst */
-static int cx24116_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd *d)
+static int cx24116_send_diseqc_msg(struct dvb_frontend *fe,
+        struct dvb_diseqc_master_cmd *d)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        int i, ret;
        /* Dump DiSEqC message */
        if (debug) {
-                printk("cx24116: %s(", __func__);
+                printk(KERN_INFO "cx24116: %s(", __func__);
-                for(i = 0 ; i < d->msg_len ;) {
+                for (i = 0 ; i < d->msg_len ;) {
-                        printk("0x%02x", d->msg[i]);
+                        printk(KERN_INFO "0x%02x", d->msg[i]);
-                        if(++i < d->msg_len)
+                        if (++i < d->msg_len)
-                                printk(", ");
+                                printk(KERN_INFO ", ");
-                        }
+                }
                printk(") toneburst=%d\n", toneburst);
        }
        /* Validate length */
-        if(d->msg_len > (CX24116_ARGLEN - CX24116_DISEQC_MSGOFS))
+        if (d->msg_len > (CX24116_ARGLEN - CX24116_DISEQC_MSGOFS))
                return -EINVAL;
        /* DiSEqC message */
@@ -918,18 +957,19 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma
        state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] = d->msg_len;
        /* Command length */
-        state->dsec_cmd.len= CX24116_DISEQC_MSGOFS + state->dsec_cmd.args[CX24116_DISEQC_MSGLEN];
+        state->dsec_cmd.len = CX24116_DISEQC_MSGOFS +
+                state->dsec_cmd.args[CX24116_DISEQC_MSGLEN];
        /* DiSEqC toneburst */
-        if(toneburst == CX24116_DISEQC_MESGCACHE)
+        if (toneburst == CX24116_DISEQC_MESGCACHE)
                /* Message is cached */
                return 0;
-        else if(toneburst == CX24116_DISEQC_TONEOFF)
+        else if (toneburst == CX24116_DISEQC_TONEOFF)
                /* Message is sent without burst */
                state->dsec_cmd.args[CX24116_DISEQC_BURST] = 0;
-        else if(toneburst == CX24116_DISEQC_TONECACHE) {
+        else if (toneburst == CX24116_DISEQC_TONECACHE) {
                /*
                 * Message is sent with derived else cached burst
                 *
@@ -948,15 +988,17 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma
                 *              Y = VOLTAGE             (0=13V, 1=18V)
                 *              Z = BAND                (0=LOW, 1=HIGH(22K))
                 */
-                if(d->msg_len >= 4 && d->msg[2] == 0x38)
+                if (d->msg_len >= 4 && d->msg[2] == 0x38)
-                        state->dsec_cmd.args[CX24116_DISEQC_BURST] = ((d->msg[3] & 4) >> 2);
+                        state->dsec_cmd.args[CX24116_DISEQC_BURST] =
-                if(debug)
+                                ((d->msg[3] & 4) >> 2);
-                        dprintk("%s burst=%d\n", __func__, state->dsec_cmd.args[CX24116_DISEQC_BURST]);
+                if (debug)
+                        dprintk("%s burst=%d\n", __func__,
+                                state->dsec_cmd.args[CX24116_DISEQC_BURST]);
        }
        /* Wait for LNB ready */
        ret = cx24116_wait_for_lnb(fe);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        /* Wait for voltage/min repeat delay */
@@ -964,7 +1006,7 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma
        /* Command */
        ret = cx24116_cmd_execute(fe, &state->dsec_cmd);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        /*
         * Wait for send
@@ -976,29 +1018,33 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma
         *  12.5ms burst        +
         * >15ms delay            (XXX determine if FW does this, see set_tone)
         */
-        msleep( (state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] << 4) + ((toneburst == CX24116_DISEQC_TONEOFF) ? 30 : 60) );
+        msleep((state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] << 4) +
+                ((toneburst == CX24116_DISEQC_TONEOFF) ? 30 : 60));
        return 0;
 }
 /* Send DiSEqC burst */
-static int cx24116_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
+static int cx24116_diseqc_send_burst(struct dvb_frontend *fe,
+        fe_sec_mini_cmd_t burst)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        int ret;
-        dprintk("%s(%d) toneburst=%d\n",__func__, burst, toneburst);
+        dprintk("%s(%d) toneburst=%d\n", __func__, burst, toneburst);
        /* DiSEqC burst */
        if (burst == SEC_MINI_A)
-                state->dsec_cmd.args[CX24116_DISEQC_BURST] = CX24116_DISEQC_MINI_A;
+                state->dsec_cmd.args[CX24116_DISEQC_BURST] =
-        else if(burst == SEC_MINI_B)
+                        CX24116_DISEQC_MINI_A;
-                state->dsec_cmd.args[CX24116_DISEQC_BURST] = CX24116_DISEQC_MINI_B;
+        else if (burst == SEC_MINI_B)
+                state->dsec_cmd.args[CX24116_DISEQC_BURST] =
+                        CX24116_DISEQC_MINI_B;
        else
                return -EINVAL;
        /* DiSEqC toneburst */
-        if(toneburst != CX24116_DISEQC_MESGCACHE)
+        if (toneburst != CX24116_DISEQC_MESGCACHE)
                /* Burst is cached */
                return 0;
@@ -1006,7 +1052,7 @@ static int cx24116_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
        /* Wait for LNB ready */
        ret = cx24116_wait_for_lnb(fe);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        /* Wait for voltage/min repeat delay */
@@ -1014,7 +1060,7 @@ static int cx24116_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
        /* Command */
        ret = cx24116_cmd_execute(fe, &state->dsec_cmd);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        /*
@@ -1027,34 +1073,32 @@ static int cx24116_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
         *  12.5ms burst        +
         * >15ms delay            (XXX determine if FW does this, see set_tone)
         */
-        msleep( (state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] << 4) + 60 );
+        msleep((state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] << 4) + 60);
        return 0;
 }
-static void cx24116_release(struct dvb_frontend* fe)
+static void cx24116_release(struct dvb_frontend *fe)
 {
-        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_state *state = fe->demodulator_priv;
-        dprintk("%s\n",__func__);
+        dprintk("%s\n", __func__);
        kfree(state);
 }
 static struct dvb_frontend_ops cx24116_ops;
-struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
+struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
-                                    struct i2c_adapter* i2c)
+        struct i2c_adapter *i2c)
 {
-        struct cx24116_state* state = NULL;
+        struct cx24116_state *state = NULL;
        int ret;
-        dprintk("%s\n",__func__);
+        dprintk("%s\n", __func__);
        /* allocate memory for the internal state */
        state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);
-        if (state == NULL) {
+        if (state == NULL)
-                printk("Unable to kmalloc\n");
                goto error1;
-        }
        /* setup the state */
        memset(state, 0, sizeof(struct cx24116_state));
@@ -1063,32 +1107,36 @@ struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
        state->i2c = i2c;
        /* check if the demod is present */
-        ret = (cx24116_readreg(state, 0xFF) << 8) | cx24116_readreg(state, 0xFE);
+        ret = (cx24116_readreg(state, 0xFF) << 8) |
+                cx24116_readreg(state, 0xFE);
        if (ret != 0x0501) {
-                printk("Invalid probe, probably not a CX24116 device\n");
+                printk(KERN_INFO "Invalid probe, probably not a CX24116 device\n");
                goto error2;
        }
        /* create dvb_frontend */
-        memcpy(&state->frontend.ops, &cx24116_ops, sizeof(struct dvb_frontend_ops));
+        memcpy(&state->frontend.ops, &cx24116_ops,
+                sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
        return &state->frontend;
 error2: kfree(state);
 error1: return NULL;
 }
+EXPORT_SYMBOL(cx24116_attach);
 /*
 * Initialise or wake up device
 *
 * Power config will reset and load initial firmware if required
 */
-static int cx24116_initfe(struct dvb_frontend* fe)
+static int cx24116_initfe(struct dvb_frontend *fe)
 {
-        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_state *state = fe->demodulator_priv;
        struct cx24116_cmd cmd;
        int ret;
-        dprintk("%s()\n",__func__);
+        dprintk("%s()\n", __func__);
        /* Power on */
        cx24116_writereg(state, 0xe0, 0);
@@ -1098,9 +1146,9 @@ static int cx24116_initfe(struct dvb_frontend* fe)
        /* Firmware CMD 36: Power config */
        cmd.args[0x00] = CMD_TUNERSLEEP;
        cmd.args[0x01] = 0;
-        cmd.len= 0x02;
+        cmd.len = 0x02;
        ret = cx24116_cmd_execute(fe, &cmd);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        return cx24116_diseqc_init(fe);
@@ -1109,20 +1157,20 @@ static int cx24116_initfe(struct dvb_frontend* fe)
 /*
 * Put device to sleep
 */
-static int cx24116_sleep(struct dvb_frontend* fe)
+static int cx24116_sleep(struct dvb_frontend *fe)
 {
-        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_state *state = fe->demodulator_priv;
        struct cx24116_cmd cmd;
        int ret;
-        dprintk("%s()\n",__func__);
+        dprintk("%s()\n", __func__);
        /* Firmware CMD 36: Power config */
        cmd.args[0x00] = CMD_TUNERSLEEP;
        cmd.args[0x01] = 1;
-        cmd.len= 0x02;
+        cmd.len = 0x02;
        ret = cx24116_cmd_execute(fe, &cmd);
-        if(ret != 0)
+        if (ret != 0)
                return ret;
        /* Power off (Shutdown clocks) */
@@ -1133,13 +1181,15 @@ static int cx24116_sleep(struct dvb_frontend* fe)
        return 0;
 }
-static int cx24116_set_property(struct dvb_frontend *fe, struct dtv_property* tvp)
+static int cx24116_set_property(struct dvb_frontend *fe,
+        struct dtv_property *tvp)
 {
        dprintk("%s(..)\n", __func__);
        return 0;
 }
-static int cx24116_get_property(struct dvb_frontend *fe, struct dtv_property* tvp)
+static int cx24116_get_property(struct dvb_frontend *fe,
+        struct dtv_property *tvp)
 {
        dprintk("%s(..)\n", __func__);
        return 0;
@@ -1148,7 +1198,8 @@ static int cx24116_get_property(struct dvb_frontend *fe, struct dtv_property* tv
 /* dvb-core told us to tune, the tv property cache will be complete,
 * it's safe for is to pull values and use them for tuning purposes.
 */
-static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx24116_set_frontend(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
 {
        struct cx24116_state *state = fe->demodulator_priv;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
@@ -1156,96 +1207,102 @@ static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
        fe_status_t tunerstat;
        int i, status, ret, retune;
-        dprintk("%s()\n",__func__);
+        dprintk("%s()\n", __func__);
-        switch(c->delivery_system) {
+        switch (c->delivery_system) {
-                case SYS_DVBS:
+        case SYS_DVBS:
-                        dprintk("%s: DVB-S delivery system selected\n",__func__);
+                dprintk("%s: DVB-S delivery system selected\n", __func__);
-                        /* Only QPSK is supported for DVB-S */
+                /* Only QPSK is supported for DVB-S */
-                        if(c->modulation != QPSK) {
+                if (c->modulation != QPSK) {
-                                dprintk("%s: unsupported modulation selected (%d)\n",
+                        dprintk("%s: unsupported modulation selected (%d)\n",
-                                        __func__, c->modulation);
+                                __func__, c->modulation);
-                                return -EOPNOTSUPP;
+                        return -EOPNOTSUPP;
-                        }
+                }
-                        /* Pilot doesn't exist in DVB-S, turn bit off */
+                /* Pilot doesn't exist in DVB-S, turn bit off */
-                        state->dnxt.pilot_val = CX24116_PILOT_OFF;
+                state->dnxt.pilot_val = CX24116_PILOT_OFF;
-                        retune = 1;
+                retune = 1;
-                        /* DVB-S only supports 0.35 */
+                /* DVB-S only supports 0.35 */
-                        if(c->rolloff != ROLLOFF_35) {
+                if (c->rolloff != ROLLOFF_35) {
-                                dprintk("%s: unsupported rolloff selected (%d)\n",
+                        dprintk("%s: unsupported rolloff selected (%d)\n",
-                                        __func__, c->rolloff);
+                                __func__, c->rolloff);
-                                return -EOPNOTSUPP;
+                        return -EOPNOTSUPP;
-                        }
+                }
-                        state->dnxt.rolloff_val = CX24116_ROLLOFF_035;
+                state->dnxt.rolloff_val = CX24116_ROLLOFF_035;
-                        break;
+                break;
-                case SYS_DVBS2:
+        case SYS_DVBS2:
-                        dprintk("%s: DVB-S2 delivery system selected\n",__func__);
+                dprintk("%s: DVB-S2 delivery system selected\n", __func__);
-                        /*
-                         * NBC 8PSK/QPSK with DVB-S is supported for DVB-S2,
-                         * but not hardware auto detection
-                         */
-                        if(c->modulation != PSK_8 && c->modulation != QPSK) {
-                                dprintk("%s: unsupported modulation selected (%d)\n",
-                                        __func__, c->modulation);
-                                return -EOPNOTSUPP;
-                        }
-                        switch(c->pilot) {
+                /*
-                                case PILOT_AUTO:        /* Not supported but emulated */
+                 * NBC 8PSK/QPSK with DVB-S is supported for DVB-S2,
-                                        retune = 2;     /* Fall-through */
+                 * but not hardware auto detection
-                                case PILOT_OFF:
+                 */
-                                        state->dnxt.pilot_val = CX24116_PILOT_OFF;
+                if (c->modulation != PSK_8 && c->modulation != QPSK) {
-                                        break;
+                        dprintk("%s: unsupported modulation selected (%d)\n",
-                                case PILOT_ON:
+                                __func__, c->modulation);
-                                        state->dnxt.pilot_val = CX24116_PILOT_ON;
+                        return -EOPNOTSUPP;
-                                        break;
+                }
-                                default:
-                                        dprintk("%s: unsupported pilot mode selected (%d)\n",
-                                                __func__, c->pilot);
-                                        return -EOPNOTSUPP;
-                        }
-                        switch(c->rolloff) {
+                switch (c->pilot) {
-                                case ROLLOFF_20:
+                case PILOT_AUTO:        /* Not supported but emulated */
-                                        state->dnxt.rolloff_val= CX24116_ROLLOFF_020;
+                        state->dnxt.pilot_val = (c->modulation == QPSK)
-                                        break;
+                                ? CX24116_PILOT_OFF : CX24116_PILOT_ON;
-                                case ROLLOFF_25:
+                        retune = 2;
-                                        state->dnxt.rolloff_val= CX24116_ROLLOFF_025;
+                        break;
-                                        break;
+                case PILOT_OFF:
-                                case ROLLOFF_35:
+                        state->dnxt.pilot_val = CX24116_PILOT_OFF;
-                                        state->dnxt.rolloff_val= CX24116_ROLLOFF_035;
+                        break;
-                                        break;
+                case PILOT_ON:
-                                case ROLLOFF_AUTO:      /* Rolloff must be explicit */
+                        state->dnxt.pilot_val = CX24116_PILOT_ON;
-                                default:
-                                        dprintk("%s: unsupported rolloff selected (%d)\n",
-                                                __func__, c->rolloff);
-                                        return -EOPNOTSUPP;
-                        }
                        break;
+                default:
+                        dprintk("%s: unsupported pilot mode selected (%d)\n",
+                                __func__, c->pilot);
+                        return -EOPNOTSUPP;
+                }
+                switch (c->rolloff) {
+                case ROLLOFF_20:
+                        state->dnxt.rolloff_val = CX24116_ROLLOFF_020;
+                        break;
+                case ROLLOFF_25:
+                        state->dnxt.rolloff_val = CX24116_ROLLOFF_025;
+                        break;
+                case ROLLOFF_35:
+                        state->dnxt.rolloff_val = CX24116_ROLLOFF_035;
+                        break;
+                case ROLLOFF_AUTO:      /* Rolloff must be explicit */
                default:
-                        dprintk("%s: unsupported delivery system selected (%d)\n",
+                        dprintk("%s: unsupported rolloff selected (%d)\n",
-                                __func__, c->delivery_system);
+                                __func__, c->rolloff);
                        return -EOPNOTSUPP;
+                }
+                break;
+        default:
+                dprintk("%s: unsupported delivery system selected (%d)\n",
+                        __func__, c->delivery_system);
+                return -EOPNOTSUPP;
        }
        state->dnxt.modulation = c->modulation;
        state->dnxt.frequency = c->frequency;
        state->dnxt.pilot = c->pilot;
        state->dnxt.rolloff = c->rolloff;
-        if ((ret = cx24116_set_inversion(state, c->inversion)) !=  0)
+        ret = cx24116_set_inversion(state, c->inversion);
+        if (ret !=  0)
                return ret;
        /* FEC_NONE/AUTO for DVB-S2 is not supported and detected here */
-        if ((ret = cx24116_set_fec(state, c->modulation, c->fec_inner)) !=  0)
+        ret = cx24116_set_fec(state, c->modulation, c->fec_inner);
+        if (ret !=  0)
                return ret;
-        if ((ret = cx24116_set_symbolrate(state, c->symbol_rate)) !=  0)
+        ret = cx24116_set_symbolrate(state, c->symbol_rate);
+        if (ret !=  0)
                return ret;
        /* discard the 'current' tuning parameters and prepare to tune */
@@ -1271,7 +1328,7 @@ static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
        /* Set/Reset B/W */
        cmd.args[0x00] = CMD_BANDWIDTH;
        cmd.args[0x01] = 0x01;
-        cmd.len= 0x02;
+        cmd.len = 0x02;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
@@ -1319,7 +1376,7 @@ static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
                cx24116_writereg(state, CX24116_REG_RATEDIV, 0x00);
        }
-        cmd.len= 0x13;
+        cmd.len = 0x13;
        /* We need to support pilot and non-pilot tuning in the
         * driver automatically. This is a workaround for because
@@ -1327,12 +1384,13 @@ static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         */
        do {
                /* Reset status register */
-                status = cx24116_readreg(state, CX24116_REG_SSTATUS) & CX24116_SIGNAL_MASK;
+                status = cx24116_readreg(state, CX24116_REG_SSTATUS)
+                        & CX24116_SIGNAL_MASK;
                cx24116_writereg(state, CX24116_REG_SSTATUS, status);
                /* Tune */
                ret = cx24116_cmd_execute(fe, &cmd);
-                if( ret != 0 )
+                if (ret != 0)
                        break;
                /*
@@ -1341,28 +1399,27 @@ static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
                 * If we are able to tune then generally it occurs within 100ms.
                 * If it takes longer, try a different toneburst setting.
                 */
-                for(i = 0; i < 50 ; i++) {
+                for (i = 0; i < 50 ; i++) {
                        cx24116_read_status(fe, &tunerstat);
                        status = tunerstat & (FE_HAS_SIGNAL | FE_HAS_SYNC);
-                        if(status == (FE_HAS_SIGNAL | FE_HAS_SYNC)) {
+                        if (status == (FE_HAS_SIGNAL | FE_HAS_SYNC)) {
-                                dprintk("%s: Tuned\n",__func__);
+                                dprintk("%s: Tuned\n", __func__);
                                goto tuned;
                        }
                        msleep(10);
                }
-                dprintk("%s: Not tuned\n",__func__);
+                dprintk("%s: Not tuned\n", __func__);
                /* Toggle pilot bit when in auto-pilot */
-                if(state->dcur.pilot == PILOT_AUTO)
+                if (state->dcur.pilot == PILOT_AUTO)
                        cmd.args[0x07] ^= CX24116_PILOT_ON;
-        }
+        } while (--retune);
-        while(--retune);
 tuned:  /* Set/Reset B/W */
        cmd.args[0x00] = CMD_BANDWIDTH;
        cmd.args[0x01] = 0x00;
-        cmd.len= 0x02;
+        cmd.len = 0x02;
        ret = cx24116_cmd_execute(fe, &cmd);
        if (ret != 0)
                return ret;
@@ -1407,17 +1464,7 @@ static struct dvb_frontend_ops cx24116_ops = {
        .set_frontend = cx24116_set_frontend,
 };
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
-module_param(toneburst, int, 0644);
-MODULE_PARM_DESC(toneburst, "DiSEqC toneburst 0=OFF, 1=TONE CACHE, 2=MESSAGE CACHE (default:1)");
-module_param(esno_snr, int, 0644);
-MODULE_PARM_DESC(debug, "SNR return units, 0=PERCENTAGE 0-100, 1=ESNO(db * 10) (default:0)");
 MODULE_DESCRIPTION("DVB Frontend module for Conexant cx24116/cx24118 hardware");
 MODULE_AUTHOR("Steven Toth");
 MODULE_LICENSE("GPL");
-EXPORT_SYMBOL(cx24116_attach);
diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb/frontends/cx24116.h
index 8dbcec268394..4cb3ddd6c626 100644
--- a/drivers/media/dvb/frontends/cx24116.h
+++ b/drivers/media/dvb/frontends/cx24116.h
@@ -23,31 +23,32 @@
 #include <linux/dvb/frontend.h>
-struct cx24116_config
+struct cx24116_config {
-{
        /* the demodulator's i2c address */
        u8 demod_address;
        /* Need to set device param for start_dma */
-        int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+        int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
        /* Need to reset device during firmware loading */
-        int (*reset_device)(struct dvb_frontend* fe);
+        int (*reset_device)(struct dvb_frontend *fe);
        /* Need to set MPEG parameters */
        u8 mpg_clk_pos_pol:0x02;
 };
 #if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)
-extern struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
+extern struct dvb_frontend *cx24116_attach(
-                                           struct i2c_adapter* i2c);
+        const struct cx24116_config *config,
+        struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
+static inline struct dvb_frontend *cx24116_attach(
-                                                  struct i2c_adapter* i2c)
+        const struct cx24116_config *config,
+        struct i2c_adapter *i2c)
 {
-        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
-#endif // CONFIG_DVB_CX24116
+#endif
 #endif /* CX24116_H */
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index 7156157cb34b..1a8c36f76061 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -33,7 +33,13 @@
 #define XTAL 10111000
 static int force_band;
+module_param(force_band, int, 0644);
+MODULE_PARM_DESC(force_band, "Force a specific band select "\
+        "(1-9, default:off).");
 static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
 #define info(args...) do { printk(KERN_INFO "CX24123: " args); } while (0)
 #define err(args...)  do { printk(KERN_ERR  "CX24123: " args); } while (0)
@@ -46,10 +52,9 @@ static int debug;
                } \
        } while (0)
-struct cx24123_state
+struct cx24123_state {
-{
+        struct i2c_adapter *i2c;
-        struct i2c_adapter* i2c;
+        const struct cx24123_config *config;
-        const struct cx24123_config* config;
        struct dvb_frontend frontend;
@@ -70,8 +75,7 @@ struct cx24123_state
 };
 /* Various tuner defaults need to be established for a given symbol rate Sps */
-static struct
+static struct cx24123_AGC_val {
-{
        u32 symbolrate_low;
        u32 symbolrate_high;
        u32 VCAprogdata;
@@ -109,8 +113,7 @@ static struct
 * fixme: The bounds on the bands do not match the doc in real life.
 * fixme: Some of them have been moved, other might need adjustment.
 */
-static struct
+static struct cx24123_bandselect_val {
-{
        u32 freq_low;
        u32 freq_high;
        u32 VCOdivider;
@@ -249,7 +252,8 @@ static int cx24123_i2c_writereg(struct cx24123_state *state,
        /* printk(KERN_DEBUG "wr(%02x): %02x %02x\n", i2c_addr, reg, data); */
-        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+        err = i2c_transfer(state->i2c, &msg, 1);
+        if (err != 1) {
                printk("%s: writereg error(err == %i, reg == 0x%02x,"
                         " data == 0x%02x)\n", __func__, err, reg, data);
                return err;
@@ -284,7 +288,8 @@ static int cx24123_i2c_readreg(struct cx24123_state *state, u8 i2c_addr, u8 reg)
 #define cx24123_writereg(state, reg, val) \
        cx24123_i2c_writereg(state, state->config->demod_address, reg, val)
-static int cx24123_set_inversion(struct cx24123_state* state, fe_spectral_inversion_t inversion)
+static int cx24123_set_inversion(struct cx24123_state *state,
+        fe_spectral_inversion_t inversion)
 {
        u8 nom_reg = cx24123_readreg(state, 0x0e);
        u8 auto_reg = cx24123_readreg(state, 0x10);
@@ -311,7 +316,8 @@ static int cx24123_set_inversion(struct cx24123_state* state, fe_spectral_invers
        return 0;
 }
-static int cx24123_get_inversion(struct cx24123_state* state, fe_spectral_inversion_t *inversion)
+static int cx24123_get_inversion(struct cx24123_state *state,
+        fe_spectral_inversion_t *inversion)
 {
        u8 val;
@@ -328,18 +334,20 @@ static int cx24123_get_inversion(struct cx24123_state* state, fe_spectral_invers
        return 0;
 }
-static int cx24123_set_fec(struct cx24123_state* state, fe_code_rate_t fec)
+static int cx24123_set_fec(struct cx24123_state *state, fe_code_rate_t fec)
 {
        u8 nom_reg = cx24123_readreg(state, 0x0e) & ~0x07;
-        if ( (fec < FEC_NONE) || (fec > FEC_AUTO) )
+        if ((fec < FEC_NONE) || (fec > FEC_AUTO))
                fec = FEC_AUTO;
        /* Set the soft decision threshold */
-        if(fec == FEC_1_2)
+        if (fec == FEC_1_2)
-                cx24123_writereg(state, 0x43, cx24123_readreg(state, 0x43) | 0x01);
+                cx24123_writereg(state, 0x43,
+                        cx24123_readreg(state, 0x43) | 0x01);
        else
-                cx24123_writereg(state, 0x43, cx24123_readreg(state, 0x43) & ~0x01);
+                cx24123_writereg(state, 0x43,
+                        cx24123_readreg(state, 0x43) & ~0x01);
        switch (fec) {
        case FEC_1_2:
@@ -388,11 +396,11 @@ static int cx24123_set_fec(struct cx24123_state* state, fe_code_rate_t fec)
        return 0;
 }
-static int cx24123_get_fec(struct cx24123_state* state, fe_code_rate_t *fec)
+static int cx24123_get_fec(struct cx24123_state *state, fe_code_rate_t *fec)
 {
        int ret;
-        ret = cx24123_readreg (state, 0x1b);
+        ret = cx24123_readreg(state, 0x1b);
        if (ret < 0)
                return ret;
        ret = ret & 0x07;
@@ -433,16 +441,16 @@ static u32 cx24123_int_log2(u32 a, u32 b)
 {
        u32 exp, nearest = 0;
        u32 div = a / b;
-        if(a % b >= b / 2) ++div;
+        if (a % b >= b / 2)
-        if(div < (1 << 31))
+                ++div;
-        {
+        if (div < (1 << 31)) {
-                for(exp = 1; div > exp; nearest++)
+                for (exp = 1; div > exp; nearest++)
                        exp += exp;
        }
        return nearest;
 }
-static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)
+static int cx24123_set_symbolrate(struct cx24123_state *state, u32 srate)
 {
        u32 tmp, sample_rate, ratio, sample_gain;
        u8 pll_mult;
@@ -498,9 +506,9 @@ static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)
        cx24123_writereg(state, 0x01, pll_mult * 6);
-        cx24123_writereg(state, 0x08, (ratio >> 16) & 0x3f );
+        cx24123_writereg(state, 0x08, (ratio >> 16) & 0x3f);
-        cx24123_writereg(state, 0x09, (ratio >>  8) & 0xff );
+        cx24123_writereg(state, 0x09, (ratio >> 8) & 0xff);
-        cx24123_writereg(state, 0x0a, (ratio      ) & 0xff );
+        cx24123_writereg(state, 0x0a, ratio & 0xff);
        /* also set the demodulator sample gain */
        sample_gain = cx24123_int_log2(sample_rate, srate);
@@ -514,10 +522,12 @@ static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)
 }
 /*
- * Based on the required frequency and symbolrate, the tuner AGC has to be configured
+ * Based on the required frequency and symbolrate, the tuner AGC has
- * and the correct band selected. Calculate those values
+ * to be configured and the correct band selected.
+ * Calculate those values.
 */
-static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx24123_pll_calculate(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        u32 ndiv = 0, adiv = 0, vco_div = 0;
@@ -525,6 +535,8 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa
        int pump = 2;
        int band = 0;
        int num_bands = ARRAY_SIZE(cx24123_bandselect_vals);
+        struct cx24123_bandselect_val *bsv = NULL;
+        struct cx24123_AGC_val *agcv = NULL;
        /* Defaults for low freq, low rate */
        state->VCAarg = cx24123_AGC_vals[0].VCAprogdata;
@@ -532,58 +544,65 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa
        state->bandselectarg = cx24123_bandselect_vals[0].progdata;
        vco_div = cx24123_bandselect_vals[0].VCOdivider;
-        /* For the given symbol rate, determine the VCA, VGA and FILTUNE programming bits */
+        /* For the given symbol rate, determine the VCA, VGA and
-        for (i = 0; i < ARRAY_SIZE(cx24123_AGC_vals); i++)
+         * FILTUNE programming bits */
-        {
+        for (i = 0; i < ARRAY_SIZE(cx24123_AGC_vals); i++) {
-                if ((cx24123_AGC_vals[i].symbolrate_low <= p->u.qpsk.symbol_rate) &&
+                agcv = &cx24123_AGC_vals[i];
-                    (cx24123_AGC_vals[i].symbolrate_high >= p->u.qpsk.symbol_rate) ) {
+                if ((agcv->symbolrate_low <= p->u.qpsk.symbol_rate) &&
-                        state->VCAarg = cx24123_AGC_vals[i].VCAprogdata;
+                    (agcv->symbolrate_high >= p->u.qpsk.symbol_rate)) {
-                        state->VGAarg = cx24123_AGC_vals[i].VGAprogdata;
+                        state->VCAarg = agcv->VCAprogdata;
-                        state->FILTune = cx24123_AGC_vals[i].FILTune;
+                        state->VGAarg = agcv->VGAprogdata;
+                        state->FILTune = agcv->FILTune;
                }
        }
        /* determine the band to use */
-        if(force_band < 1 || force_band > num_bands)
+        if (force_band < 1 || force_band > num_bands) {
-        {
+                for (i = 0; i < num_bands; i++) {
-                for (i = 0; i < num_bands; i++)
+                        bsv = &cx24123_bandselect_vals[i];
-                {
+                        if ((bsv->freq_low <= p->frequency) &&
-                        if ((cx24123_bandselect_vals[i].freq_low <= p->frequency) &&
+                                (bsv->freq_high >= p->frequency))
-                            (cx24123_bandselect_vals[i].freq_high >= p->frequency) )
                                band = i;
                }
-        }
+        } else
-        else
                band = force_band - 1;
        state->bandselectarg = cx24123_bandselect_vals[band].progdata;
        vco_div = cx24123_bandselect_vals[band].VCOdivider;
        /* determine the charge pump current */
-        if ( p->frequency < (cx24123_bandselect_vals[band].freq_low + cx24123_bandselect_vals[band].freq_high)/2 )
+        if (p->frequency < (cx24123_bandselect_vals[band].freq_low +
+                cx24123_bandselect_vals[band].freq_high) / 2)
                pump = 0x01;
        else
                pump = 0x02;
        /* Determine the N/A dividers for the requested lband freq (in kHz). */
-        /* Note: the reference divider R=10, frequency is in KHz, XTAL is in Hz */
+        /* Note: the reference divider R=10, frequency is in KHz,
-        ndiv = ( ((p->frequency * vco_div * 10) / (2 * XTAL / 1000)) / 32) & 0x1ff;
+         * XTAL is in Hz */
-        adiv = ( ((p->frequency * vco_div * 10) / (2 * XTAL / 1000)) % 32) & 0x1f;
+        ndiv = (((p->frequency * vco_div * 10) /
+                (2 * XTAL / 1000)) / 32) & 0x1ff;
+        adiv = (((p->frequency * vco_div * 10) /
+                (2 * XTAL / 1000)) % 32) & 0x1f;
        if (adiv == 0 && ndiv > 0)
                ndiv--;
-        /* control bits 11, refdiv 11, charge pump polarity 1, charge pump current, ndiv, adiv */
+        /* control bits 11, refdiv 11, charge pump polarity 1,
-        state->pllarg = (3 << 19) | (3 << 17) | (1 << 16) | (pump << 14) | (ndiv << 5) | adiv;
+         * charge pump current, ndiv, adiv */
+        state->pllarg = (3 << 19) | (3 << 17) | (1 << 16) |
+                (pump << 14) | (ndiv << 5) | adiv;
        return 0;
 }
 /*
 * Tuner data is 21 bits long, must be left-aligned in data.
- * Tuner cx24109 is written through a dedicated 3wire interface on the demod chip.
+ * Tuner cx24109 is written through a dedicated 3wire interface
+ * on the demod chip.
 */
-static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_parameters *p, u32 data)
+static int cx24123_pll_writereg(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p, u32 data)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        unsigned long timeout;
@@ -610,7 +629,7 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par
        /* send another 8 bytes, wait for the send to be completed */
        timeout = jiffies + msecs_to_jiffies(40);
-        cx24123_writereg(state, 0x22, (data>>8) & 0xff );
+        cx24123_writereg(state, 0x22, (data >> 8) & 0xff);
        while ((cx24123_readreg(state, 0x20) & 0x40) == 0) {
                if (time_after(jiffies, timeout)) {
                        err("%s:  demodulator is not responding, "\
@@ -620,9 +639,10 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par
                msleep(10);
        }
-        /* send the lower 5 bits of this byte, padded with 3 LBB, wait for the send to be completed */
+        /* send the lower 5 bits of this byte, padded with 3 LBB,
+         * wait for the send to be completed */
        timeout = jiffies + msecs_to_jiffies(40);
-        cx24123_writereg(state, 0x22, (data) & 0xff );
+        cx24123_writereg(state, 0x22, (data) & 0xff);
        while ((cx24123_readreg(state, 0x20) & 0x80)) {
                if (time_after(jiffies, timeout)) {
                        err("%s:  demodulator is not responding," \
@@ -639,7 +659,8 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par
        return 0;
 }
-static int cx24123_pll_tune(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx24123_pll_tune(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        u8 val;
@@ -690,7 +711,7 @@ static int cx24123_repeater_mode(struct cx24123_state *state, u8 mode, u8 start)
        return cx24123_writereg(state, 0x23, r);
 }
-static int cx24123_initfe(struct dvb_frontend* fe)
+static int cx24123_initfe(struct dvb_frontend *fe)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        int i;
@@ -699,19 +720,22 @@ static int cx24123_initfe(struct dvb_frontend* fe)
        /* Configure the demod to a good set of defaults */
        for (i = 0; i < ARRAY_SIZE(cx24123_regdata); i++)
-                cx24123_writereg(state, cx24123_regdata[i].reg, cx24123_regdata[i].data);
+                cx24123_writereg(state, cx24123_regdata[i].reg,
+                        cx24123_regdata[i].data);
        /* Set the LNB polarity */
-        if(state->config->lnb_polarity)
+        if (state->config->lnb_polarity)
-                cx24123_writereg(state, 0x32, cx24123_readreg(state, 0x32) | 0x02);
+                cx24123_writereg(state, 0x32,
+                        cx24123_readreg(state, 0x32) | 0x02);
        if (state->config->dont_use_pll)
-        cx24123_repeater_mode(state, 1, 0);
+                cx24123_repeater_mode(state, 1, 0);
        return 0;
 }
-static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+static int cx24123_set_voltage(struct dvb_frontend *fe,
+        fe_sec_voltage_t voltage)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        u8 val;
@@ -740,7 +764,7 @@ static void cx24123_wait_for_diseqc(struct cx24123_state *state)
 {
        unsigned long timeout = jiffies + msecs_to_jiffies(200);
        while (!(cx24123_readreg(state, 0x29) & 0x40)) {
-                if(time_after(jiffies, timeout)) {
+                if (time_after(jiffies, timeout)) {
                        err("%s: diseqc queue not ready, " \
                                "command may be lost.\n", __func__);
                        break;
@@ -749,7 +773,8 @@ static void cx24123_wait_for_diseqc(struct cx24123_state *state)
        }
 }
-static int cx24123_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd *cmd)
+static int cx24123_send_diseqc_msg(struct dvb_frontend *fe,
+        struct dvb_diseqc_master_cmd *cmd)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        int i, val, tone;
@@ -771,20 +796,21 @@ static int cx24123_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma
                cx24123_writereg(state, 0x2C + i, cmd->msg[i]);
        val = cx24123_readreg(state, 0x29);
-        cx24123_writereg(state, 0x29, ((val & 0x90) | 0x40) | ((cmd->msg_len-3) & 3));
+        cx24123_writereg(state, 0x29, ((val & 0x90) | 0x40) |
+                ((cmd->msg_len-3) & 3));
        /* wait for diseqc message to finish sending */
        cx24123_wait_for_diseqc(state);
        /* restart continuous tone if enabled */
-        if (tone & 0x10) {
+        if (tone & 0x10)
                cx24123_writereg(state, 0x29, tone & ~0x40);
-        }
        return 0;
 }
-static int cx24123_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
+static int cx24123_diseqc_send_burst(struct dvb_frontend *fe,
+        fe_sec_mini_cmd_t burst)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        int val, tone;
@@ -814,13 +840,13 @@ static int cx24123_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
        cx24123_writereg(state, 0x2a, cx24123_readreg(state, 0x2a) & 0xfb);
        /* restart continuous tone if enabled */
-        if (tone & 0x10) {
+        if (tone & 0x10)
                cx24123_writereg(state, 0x29, tone & ~0x40);
-        }
        return 0;
 }
-static int cx24123_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int cx24123_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        int sync = cx24123_readreg(state, 0x14);
@@ -853,8 +879,9 @@ static int cx24123_read_status(struct dvb_frontend* fe, fe_status_t* status)
 }
 /*
- * Configured to return the measurement of errors in blocks, because no UCBLOCKS value
+ * Configured to return the measurement of errors in blocks,
- * is available, so this value doubles up to satisfy both measurements
+ * because no UCBLOCKS value is available, so this value doubles up
+ * to satisfy both measurements.
 */
 static int cx24123_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
@@ -876,7 +903,8 @@ static int cx24123_read_signal_strength(struct dvb_frontend *fe,
 {
        struct cx24123_state *state = fe->demodulator_priv;
-        *signal_strength = cx24123_readreg(state, 0x3b) << 8; /* larger = better */
+        /* larger = better */
+        *signal_strength = cx24123_readreg(state, 0x3b) << 8;
        dprintk("Signal strength = %d\n", *signal_strength);
@@ -907,7 +935,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,
        if (state->config->set_ts_params)
                state->config->set_ts_params(fe, 0);
-        state->currentfreq=p->frequency;
+        state->currentfreq = p->frequency;
        state->currentsymbolrate = p->u.qpsk.symbol_rate;
        cx24123_set_inversion(state, p->inversion);
@@ -932,7 +960,8 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,
        return 0;
 }
-static int cx24123_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx24123_get_frontend(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
 {
        struct cx24123_state *state = fe->demodulator_priv;
@@ -952,7 +981,7 @@ static int cx24123_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
        return 0;
 }
-static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+static int cx24123_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
 {
        struct cx24123_state *state = fe->demodulator_priv;
        u8 val;
@@ -977,8 +1006,8 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
        return 0;
 }
-static int cx24123_tune(struct dvb_frontend* fe,
+static int cx24123_tune(struct dvb_frontend *fe,
-                        struct dvb_frontend_parameters* params,
+                        struct dvb_frontend_parameters *params,
                        unsigned int mode_flags,
                        unsigned int *delay,
                        fe_status_t *status)
@@ -997,12 +1026,12 @@ static int cx24123_tune(struct dvb_frontend* fe,
 static int cx24123_get_algo(struct dvb_frontend *fe)
 {
-        return 1; //FE_ALGO_HW
+        return 1; /* FE_ALGO_HW */
 }
-static void cx24123_release(struct dvb_frontend* fe)
+static void cx24123_release(struct dvb_frontend *fe)
 {
-        struct cx24123_state* state = fe->demodulator_priv;
+        struct cx24123_state *state = fe->demodulator_priv;
        dprintk("\n");
        i2c_del_adapter(&state->tuner_i2c_adapter);
        kfree(state);
@@ -1013,7 +1042,7 @@ static int cx24123_tuner_i2c_tuner_xfer(struct i2c_adapter *i2c_adap,
 {
        struct cx24123_state *state = i2c_get_adapdata(i2c_adap);
        /* this repeater closes after the first stop */
-    cx24123_repeater_mode(state, 1, 1);
+        cx24123_repeater_mode(state, 1, 1);
        return i2c_transfer(state->i2c, msg, num);
 }
@@ -1037,8 +1066,8 @@ EXPORT_SYMBOL(cx24123_get_tuner_i2c_adapter);
 static struct dvb_frontend_ops cx24123_ops;
-struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,
+struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
-                                    struct i2c_adapter* i2c)
+                                    struct i2c_adapter *i2c)
 {
        struct cx24123_state *state =
                kzalloc(sizeof(struct cx24123_state), GFP_KERNEL);
@@ -1057,20 +1086,25 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,
        /* check if the demod is there */
        state->demod_rev = cx24123_readreg(state, 0x00);
        switch (state->demod_rev) {
-        case 0xe1: info("detected CX24123C\n"); break;
+        case 0xe1:
-        case 0xd1: info("detected CX24123\n"); break;
+                info("detected CX24123C\n");
+                break;
+        case 0xd1:
+                info("detected CX24123\n");
+                break;
        default:
                err("wrong demod revision: %x\n", state->demod_rev);
                goto error;
        }
        /* create dvb_frontend */
-        memcpy(&state->frontend.ops, &cx24123_ops, sizeof(struct dvb_frontend_ops));
+        memcpy(&state->frontend.ops, &cx24123_ops,
+                sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
-    /* create tuner i2c adapter */
+        /* create tuner i2c adapter */
-    if (config->dont_use_pll)
+        if (config->dont_use_pll)
-        cx24123_repeater_mode(state, 1, 0);
+                cx24123_repeater_mode(state, 1, 0);
        strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",
                sizeof(state->tuner_i2c_adapter.name));
@@ -1079,7 +1113,7 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,
        state->tuner_i2c_adapter.algo_data = NULL;
        i2c_set_adapdata(&state->tuner_i2c_adapter, state);
        if (i2c_add_adapter(&state->tuner_i2c_adapter) < 0) {
-        err("tuner i2c bus could not be initialized\n");
+                err("tuner i2c bus could not be initialized\n");
                goto error;
        }
@@ -1090,6 +1124,7 @@ error:
        return NULL;
 }
+EXPORT_SYMBOL(cx24123_attach);
 static struct dvb_frontend_ops cx24123_ops = {
@@ -1126,15 +1161,8 @@ static struct dvb_frontend_ops cx24123_ops = {
        .get_frontend_algo = cx24123_get_algo,
 };
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
-module_param(force_band, int, 0644);
-MODULE_PARM_DESC(force_band, "Force a specific band select (1-9, default:off).");
 MODULE_DESCRIPTION("DVB Frontend module for Conexant " \
        "CX24123/CX24109/CX24113 hardware");
 MODULE_AUTHOR("Steven Toth");
 MODULE_LICENSE("GPL");
-EXPORT_SYMBOL(cx24123_attach);
diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb/frontends/cx24123.h
index cc6b411d6d20..51ae866e9fed 100644
--- a/drivers/media/dvb/frontends/cx24123.h
+++ b/drivers/media/dvb/frontends/cx24123.h
@@ -23,13 +23,12 @@
 #include <linux/dvb/frontend.h>
-struct cx24123_config
+struct cx24123_config {
-{
        /* the demodulator's i2c address */
        u8 demod_address;
        /* Need to set device param for start_dma */
-        int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+        int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
        /* 0 = LNB voltage normal, 1 = LNB voltage inverted */
        int lnb_polarity;
@@ -39,7 +38,8 @@ struct cx24123_config
        void (*agc_callback) (struct dvb_frontend *);
 };
-#if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) && defined(MODULE))
+#if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) \
+        && defined(MODULE))
 extern struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
                                           struct i2c_adapter *i2c);
 extern struct i2c_adapter *cx24123_get_tuner_i2c_adapter(struct dvb_frontend *);
@@ -56,6 +56,6 @@ static struct i2c_adapter *
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
-#endif // CONFIG_DVB_CX24123
+#endif
 #endif /* CX24123_H */
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 7500a1c53e68..cf4d8936bb83 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -30,10 +30,10 @@
 struct s5h1409_state {
-        struct i2c_adapter* i2c;
+        struct i2c_adapter *i2c;
        /* configuration settings */
-        const struct s5h1409_config* config;
+        const struct s5h1409_config *config;
        struct dvb_frontend frontend;
@@ -48,6 +48,9 @@ struct s5h1409_state {
 };
 static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 #define dprintk if (debug) printk
 /* Register values to initialise the demod, this will set VSB by default */
@@ -299,10 +302,10 @@ static struct qam256_snr_tab {
 };
 /* 8 bit registers, 16 bit values */
-static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)
+static int s5h1409_writereg(struct s5h1409_state *state, u8 reg, u16 data)
 {
        int ret;
-        u8 buf [] = { reg, data >> 8,  data & 0xff };
+        u8 buf[] = { reg, data >> 8,  data & 0xff };
        struct i2c_msg msg = { .addr = state->config->demod_address,
                               .flags = 0, .buf = buf, .len = 3 };
@@ -310,19 +313,19 @@ static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)
        ret = i2c_transfer(state->i2c, &msg, 1);
        if (ret != 1)
-                printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, "
+                printk(KERN_ERR "%s: error (reg == 0x%02x, val == 0x%04x, "
                       "ret == %i)\n", __func__, reg, data, ret);
        return (ret != 1) ? -1 : 0;
 }
-static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)
+static u16 s5h1409_readreg(struct s5h1409_state *state, u8 reg)
 {
        int ret;
-        u8 b0 [] = { reg };
+        u8 b0[] = { reg };
-        u8 b1 [] = { 0, 0 };
+        u8 b1[] = { 0, 0 };
-        struct i2c_msg msg [] = {
+        struct i2c_msg msg[] = {
                { .addr = state->config->demod_address, .flags = 0,
                  .buf = b0, .len = 1 },
                { .addr = state->config->demod_address, .flags = I2C_M_RD,
@@ -335,9 +338,9 @@ static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)
        return (b1[0] << 8) | b1[1];
 }
-static int s5h1409_softreset(struct dvb_frontend* fe)
+static int s5h1409_softreset(struct dvb_frontend *fe)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s()\n", __func__);
@@ -349,11 +352,11 @@ static int s5h1409_softreset(struct dvb_frontend* fe)
 }
 #define S5H1409_VSB_IF_FREQ 5380
-#define S5H1409_QAM_IF_FREQ state->config->qam_if
+#define S5H1409_QAM_IF_FREQ (state->config->qam_if)
-static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)
+static int s5h1409_set_if_freq(struct dvb_frontend *fe, int KHz)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(%d KHz)\n", __func__, KHz);
@@ -376,26 +379,26 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)
        return 0;
 }
-static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted)
+static int s5h1409_set_spectralinversion(struct dvb_frontend *fe, int inverted)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(%d)\n", __func__, inverted);
-        if(inverted == 1)
+        if (inverted == 1)
                return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */
        else
                return s5h1409_writereg(state, 0x1b, 0x0110); /* Normal */
 }
-static int s5h1409_enable_modulation(struct dvb_frontend* fe,
+static int s5h1409_enable_modulation(struct dvb_frontend *fe,
                                     fe_modulation_t m)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(0x%08x)\n", __func__, m);
-        switch(m) {
+        switch (m) {
        case VSB_8:
                dprintk("%s() VSB_8\n", __func__);
                if (state->if_freq != S5H1409_VSB_IF_FREQ)
@@ -422,9 +425,9 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,
        return 0;
 }
-static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+static int s5h1409_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(%d)\n", __func__, enable);
@@ -434,9 +437,9 @@ static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
                return s5h1409_writereg(state, 0xf3, 0);
 }
-static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
+static int s5h1409_set_gpio(struct dvb_frontend *fe, int enable)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(%d)\n", __func__, enable);
@@ -448,18 +451,18 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
                        s5h1409_readreg(state, 0xe3) & 0xfeff);
 }
-static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
+static int s5h1409_sleep(struct dvb_frontend *fe, int enable)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(%d)\n", __func__, enable);
        return s5h1409_writereg(state, 0xf2, enable);
 }
-static int s5h1409_register_reset(struct dvb_frontend* fe)
+static int s5h1409_register_reset(struct dvb_frontend *fe)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s()\n", __func__);
@@ -483,7 +486,7 @@ static void s5h1409_set_qam_amhum_mode(struct dvb_frontend *fe)
                reg &= 0xff;
                s5h1409_writereg(state, 0x96, 0x00c);
-                if ((reg < 0x38) || (reg > 0x68) ) {
+                if ((reg < 0x38) || (reg > 0x68)) {
                        s5h1409_writereg(state, 0x93, 0x3332);
                        s5h1409_writereg(state, 0x9e, 0x2c37);
                } else {
@@ -514,7 +517,7 @@ static void s5h1409_set_qam_interleave_mode(struct dvb_frontend *fe)
                        s5h1409_writereg(state, 0x96, 0x20);
                        s5h1409_writereg(state, 0xad,
-                                ( ((reg1 & 0xf000) >> 4) | (reg2 & 0xf0ff)) );
+                                (((reg1 & 0xf000) >> 4) | (reg2 & 0xf0ff)));
                        s5h1409_writereg(state, 0xab,
                                s5h1409_readreg(state, 0xab) & 0xeffe);
                }
@@ -529,10 +532,10 @@ static void s5h1409_set_qam_interleave_mode(struct dvb_frontend *fe)
 }
 /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
-static int s5h1409_set_frontend (struct dvb_frontend* fe,
+static int s5h1409_set_frontend(struct dvb_frontend *fe,
                                 struct dvb_frontend_parameters *p)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s(frequency=%d)\n", __func__, p->frequency);
@@ -546,9 +549,11 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe,
        msleep(100);
        if (fe->ops.tuner_ops.set_params) {
-                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
                fe->ops.tuner_ops.set_params(fe, p);
-                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
        }
        /* Optimize the demod for QAM */
@@ -592,17 +597,17 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
 /* Reset the demod hardware and reset all of the configuration registers
   to a default state. */
-static int s5h1409_init (struct dvb_frontend* fe)
+static int s5h1409_init(struct dvb_frontend *fe)
 {
        int i;
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        dprintk("%s()\n", __func__);
        s5h1409_sleep(fe, 0);
        s5h1409_register_reset(fe);
-        for (i=0; i < ARRAY_SIZE(init_tab); i++)
+        for (i = 0; i < ARRAY_SIZE(init_tab); i++)
                s5h1409_writereg(state, init_tab[i].reg, init_tab[i].data);
        /* The datasheet says that after initialisation, VSB is default */
@@ -627,9 +632,9 @@ static int s5h1409_init (struct dvb_frontend* fe)
        return 0;
 }
-static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int s5h1409_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        u16 reg;
        u32 tuner_status = 0;
@@ -637,12 +642,12 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
        /* Get the demodulator status */
        reg = s5h1409_readreg(state, 0xf1);
-        if(reg & 0x1000)
+        if (reg & 0x1000)
                *status |= FE_HAS_VITERBI;
-        if(reg & 0x8000)
+        if (reg & 0x8000)
                *status |= FE_HAS_LOCK | FE_HAS_SYNC;
-        switch(state->config->status_mode) {
+        switch (state->config->status_mode) {
        case S5H1409_DEMODLOCKING:
                if (*status & FE_HAS_VITERBI)
                        *status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;
@@ -668,12 +673,12 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
        return 0;
 }
-static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
+static int s5h1409_qam256_lookup_snr(struct dvb_frontend *fe, u16 *snr, u16 v)
 {
        int i, ret = -EINVAL;
        dprintk("%s()\n", __func__);
-        for (i=0; i < ARRAY_SIZE(qam256_snr_tab); i++) {
+        for (i = 0; i < ARRAY_SIZE(qam256_snr_tab); i++) {
                if (v < qam256_snr_tab[i].val) {
                        *snr = qam256_snr_tab[i].data;
                        ret = 0;
@@ -683,12 +688,12 @@ static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
        return ret;
 }
-static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
+static int s5h1409_qam64_lookup_snr(struct dvb_frontend *fe, u16 *snr, u16 v)
 {
        int i, ret = -EINVAL;
        dprintk("%s()\n", __func__);
-        for (i=0; i < ARRAY_SIZE(qam64_snr_tab); i++) {
+        for (i = 0; i < ARRAY_SIZE(qam64_snr_tab); i++) {
                if (v < qam64_snr_tab[i].val) {
                        *snr = qam64_snr_tab[i].data;
                        ret = 0;
@@ -698,12 +703,12 @@ static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
        return ret;
 }
-static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
+static int s5h1409_vsb_lookup_snr(struct dvb_frontend *fe, u16 *snr, u16 v)
 {
        int i, ret = -EINVAL;
        dprintk("%s()\n", __func__);
-        for (i=0; i < ARRAY_SIZE(vsb_snr_tab); i++) {
+        for (i = 0; i < ARRAY_SIZE(vsb_snr_tab); i++) {
                if (v > vsb_snr_tab[i].val) {
                        *snr = vsb_snr_tab[i].data;
                        ret = 0;
@@ -714,13 +719,13 @@ static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
        return ret;
 }
-static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)
+static int s5h1409_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        u16 reg;
        dprintk("%s()\n", __func__);
-        switch(state->current_modulation) {
+        switch (state->current_modulation) {
        case QAM_64:
                reg = s5h1409_readreg(state, 0xf0) & 0xff;
                return s5h1409_qam64_lookup_snr(fe, snr, reg);
@@ -737,30 +742,30 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)
        return -EINVAL;
 }
-static int s5h1409_read_signal_strength(struct dvb_frontend* fe,
+static int s5h1409_read_signal_strength(struct dvb_frontend *fe,
-                                        u16* signal_strength)
+                                        u16 *signal_strength)
 {
        return s5h1409_read_snr(fe, signal_strength);
 }
-static int s5h1409_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
+static int s5h1409_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        *ucblocks = s5h1409_readreg(state, 0xb5);
        return 0;
 }
-static int s5h1409_read_ber(struct dvb_frontend* fe, u32* ber)
+static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
        return s5h1409_read_ucblocks(fe, ber);
 }
-static int s5h1409_get_frontend(struct dvb_frontend* fe,
+static int s5h1409_get_frontend(struct dvb_frontend *fe,
                                struct dvb_frontend_parameters *p)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        p->frequency = state->current_frequency;
        p->u.vsb.modulation = state->current_modulation;
@@ -768,25 +773,25 @@ static int s5h1409_get_frontend(struct dvb_frontend* fe,
        return 0;
 }
-static int s5h1409_get_tune_settings(struct dvb_frontend* fe,
+static int s5h1409_get_tune_settings(struct dvb_frontend *fe,
                                     struct dvb_frontend_tune_settings *tune)
 {
        tune->min_delay_ms = 1000;
        return 0;
 }
-static void s5h1409_release(struct dvb_frontend* fe)
+static void s5h1409_release(struct dvb_frontend *fe)
 {
-        struct s5h1409_state* state = fe->demodulator_priv;
+        struct s5h1409_state *state = fe->demodulator_priv;
        kfree(state);
 }
 static struct dvb_frontend_ops s5h1409_ops;
-struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
+struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config,
-                                    struct i2c_adapter* i2c)
+                                    struct i2c_adapter *i2c)
 {
-        struct s5h1409_state* state = NULL;
+        struct s5h1409_state *state = NULL;
        u16 reg;
        /* allocate memory for the internal state */
@@ -825,6 +830,7 @@ error:
        kfree(state);
        return NULL;
 }
+EXPORT_SYMBOL(s5h1409_attach);
 static struct dvb_frontend_ops s5h1409_ops = {
@@ -850,14 +856,10 @@ static struct dvb_frontend_ops s5h1409_ops = {
        .release              = s5h1409_release,
 };
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 MODULE_DESCRIPTION("Samsung S5H1409 QAM-B/ATSC Demodulator driver");
 MODULE_AUTHOR("Steven Toth");
 MODULE_LICENSE("GPL");
-EXPORT_SYMBOL(s5h1409_attach);
 /*
 * Local variables:
diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h
index d1a1d2eb8e11..070d9743e330 100644
--- a/drivers/media/dvb/frontends/s5h1409.h
+++ b/drivers/media/dvb/frontends/s5h1409.h
@@ -24,8 +24,7 @@
 #include <linux/dvb/frontend.h>
-struct s5h1409_config
+struct s5h1409_config {
-{
        /* the demodulator's i2c address */
        u8 demod_address;
@@ -60,12 +59,14 @@ struct s5h1409_config
        u16 mpeg_timing;
 };
-#if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) && defined(MODULE))
+#if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) \
-extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
+        && defined(MODULE))
-                                           struct i2c_adapter* i2c);
+extern struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config,
+                                           struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
+static inline struct dvb_frontend *s5h1409_attach(
-                                                  struct i2c_adapter* i2c)
+        const struct s5h1409_config *config,
+        struct i2c_adapter *i2c)
 {
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c
index 2da1a3763de9..2febfb5a846b 100644
--- a/drivers/media/dvb/frontends/s5h1411.c
+++ b/drivers/media/dvb/frontends/s5h1411.c
@@ -343,7 +343,7 @@ static int s5h1411_writereg(struct s5h1411_state *state,
        u8 addr, u8 reg, u16 data)
 {
        int ret;
-        u8 buf [] = { reg, data >> 8,  data & 0xff };
+        u8 buf[] = { reg, data >> 8,  data & 0xff };
        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };
@@ -359,10 +359,10 @@ static int s5h1411_writereg(struct s5h1411_state *state,
 static u16 s5h1411_readreg(struct s5h1411_state *state, u8 addr, u8 reg)
 {
        int ret;
-        u8 b0 [] = { reg };
+        u8 b0[] = { reg };
-        u8 b1 [] = { 0, 0 };
+        u8 b1[] = { 0, 0 };
-        struct i2c_msg msg [] = {
+        struct i2c_msg msg[] = {
                { .addr = addr, .flags = 0, .buf = b0, .len = 1 },
                { .addr = addr, .flags = I2C_M_RD, .buf = b1, .len = 2 } };
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c
index 04e7f1cc1403..2a8bbcd44cd0 100644
--- a/drivers/media/dvb/frontends/tda10048.c
+++ b/drivers/media/dvb/frontends/tda10048.c
@@ -195,7 +195,7 @@ static struct init_tab {
 static int tda10048_writereg(struct tda10048_state *state, u8 reg, u8 data)
 {
        int ret;
-        u8 buf [] = { reg, data };
+        u8 buf[] = { reg, data };
        struct i2c_msg msg = {
                .addr = state->config->demod_address,
                .flags = 0, .buf = buf, .len = 2 };
@@ -213,9 +213,9 @@ static int tda10048_writereg(struct tda10048_state *state, u8 reg, u8 data)
 static u8 tda10048_readreg(struct tda10048_state *state, u8 reg)
 {
        int ret;
-        u8 b0 [] = { reg };
+        u8 b0[] = { reg };
-        u8 b1 [] = { 0 };
+        u8 b1[] = { 0 };
-        struct i2c_msg msg [] = {
+        struct i2c_msg msg[] = {
                { .addr = state->config->demod_address,
                        .flags = 0, .buf = b0, .len = 1 },
                { .addr = state->config->demod_address,
@@ -393,43 +393,89 @@ static int tda10048_get_tps(struct tda10048_state *state,
        val = tda10048_readreg(state, TDA10048_OUT_CONF2);
        switch ((val & 0x60) >> 5) {
-        case 0: p->constellation =   QPSK; break;
+        case 0:
-        case 1: p->constellation = QAM_16; break;
+                p->constellation = QPSK;
-        case 2: p->constellation = QAM_64; break;
+                break;
+        case 1:
+                p->constellation = QAM_16;
+                break;
+        case 2:
+                p->constellation = QAM_64;
+                break;
        }
        switch ((val & 0x18) >> 3) {
-        case 0: p->hierarchy_information = HIERARCHY_NONE; break;
+        case 0:
-        case 1: p->hierarchy_information =    HIERARCHY_1; break;
+                p->hierarchy_information = HIERARCHY_NONE;
-        case 2: p->hierarchy_information =    HIERARCHY_2; break;
+                break;
-        case 3: p->hierarchy_information =    HIERARCHY_4; break;
+        case 1:
+                p->hierarchy_information = HIERARCHY_1;
+                break;
+        case 2:
+                p->hierarchy_information = HIERARCHY_2;
+                break;
+        case 3:
+                p->hierarchy_information = HIERARCHY_4;
+                break;
        }
        switch (val & 0x07) {
-        case 0: p->code_rate_HP = FEC_1_2; break;
+        case 0:
-        case 1: p->code_rate_HP = FEC_2_3; break;
+                p->code_rate_HP = FEC_1_2;
-        case 2: p->code_rate_HP = FEC_3_4; break;
+                break;
-        case 3: p->code_rate_HP = FEC_5_6; break;
+        case 1:
-        case 4: p->code_rate_HP = FEC_7_8; break;
+                p->code_rate_HP = FEC_2_3;
+                break;
+        case 2:
+                p->code_rate_HP = FEC_3_4;
+                break;
+        case 3:
+                p->code_rate_HP = FEC_5_6;
+                break;
+        case 4:
+                p->code_rate_HP = FEC_7_8;
+                break;
        }
        val = tda10048_readreg(state, TDA10048_OUT_CONF3);
        switch (val & 0x07) {
-        case 0: p->code_rate_LP = FEC_1_2; break;
+        case 0:
-        case 1: p->code_rate_LP = FEC_2_3; break;
+                p->code_rate_LP = FEC_1_2;
-        case 2: p->code_rate_LP = FEC_3_4; break;
+                break;
-        case 3: p->code_rate_LP = FEC_5_6; break;
+        case 1:
-        case 4: p->code_rate_LP = FEC_7_8; break;
+                p->code_rate_LP = FEC_2_3;
+                break;
+        case 2:
+                p->code_rate_LP = FEC_3_4;
+                break;
+        case 3:
+                p->code_rate_LP = FEC_5_6;
+                break;
+        case 4:
+                p->code_rate_LP = FEC_7_8;
+                break;
        }
        val = tda10048_readreg(state, TDA10048_OUT_CONF1);
        switch ((val & 0x0c) >> 2) {
-        case 0: p->guard_interval = GUARD_INTERVAL_1_32; break;
+        case 0:
-        case 1: p->guard_interval = GUARD_INTERVAL_1_16; break;
+                p->guard_interval = GUARD_INTERVAL_1_32;
-        case 2: p->guard_interval =  GUARD_INTERVAL_1_8; break;
+                break;
-        case 3: p->guard_interval =  GUARD_INTERVAL_1_4; break;
+        case 1:
+                p->guard_interval = GUARD_INTERVAL_1_16;
+                break;
+        case 2:
+                p->guard_interval =  GUARD_INTERVAL_1_8;
+                break;
+        case 3:
+                p->guard_interval =  GUARD_INTERVAL_1_4;
+                break;
        }
        switch (val & 0x02) {
-        case 0: p->transmission_mode = TRANSMISSION_MODE_2K; break;
+        case 0:
-        case 1: p->transmission_mode = TRANSMISSION_MODE_8K; break;
+                p->transmission_mode = TRANSMISSION_MODE_2K;
+                break;
+        case 1:
+                p->transmission_mode = TRANSMISSION_MODE_8K;
+                break;
        }
        return 0;
diff --git a/drivers/media/dvb/frontends/z0194a.h b/drivers/media/dvb/frontends/z0194a.h
index d2876d2e1769..07f3fc0998f6 100644
--- a/drivers/media/dvb/frontends/z0194a.h
+++ b/drivers/media/dvb/frontends/z0194a.h
@@ -12,7 +12,7 @@
 #ifndef Z0194A
 #define Z0194A
-static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,
+static int sharp_z0194a_set_symbol_rate(struct dvb_frontend *fe,
                                         u32 srate, u32 ratio)
 {
        u8 aclk = 0;
@@ -40,7 +40,7 @@ static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,
        return 0;
 }
-static u8 sharp_z0194a__inittab[] = {
+static u8 sharp_z0194a_inittab[] = {
        0x01, 0x15,
        0x02, 0x00,
        0x03, 0x00,
@@ -82,16 +82,4 @@ static u8 sharp_z0194a__inittab[] = {
        0xff, 0xff
 };
-static struct stv0299_config sharp_z0194a_config = {
-        .demod_address = 0x68,
-        .inittab = sharp_z0194a__inittab,
-        .mclk = 88000000UL,
-        .invert = 1,
-        .skip_reinit = 0,
-        .lock_output = STV0299_LOCKOUTPUT_1,
-        .volt13_op0_op1 = STV0299_VOLT13_OP1,
-        .min_delay_ms = 100,
-        .set_symbol_rate = sharp_z0194a__set_symbol_rate,
-};
 #endif