Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e3599a5 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9256): cx22702: Checkpatch compliance 



cx22702: Checkpatch compliance

Signed-off-by: default avatarSteven Toth <stoth@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5c2a164a

drivers/media/dvb/frontends/cx22702.c

+306 −200
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "dvb_frontend.h"

#include "cx22702.h"





struct cx22702_state {



	struct i2c_adapter *i2c;
@@ -49,6 +48,9 @@ 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 */
@@ -84,12 +86,15 @@ static int cx22702_writereg (struct cx22702_state* state, u8 reg, u8 data) 
{

	int ret;

	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;
@@ -102,13 +107,16 @@ static u8 cx22702_readreg (struct cx22702_state* state, u8 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 = I2C_M_RD, .buf = b1, .len = 1 } };

		{ .addr = state->config->demod_address, .flags = 0,

			.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];

}
@@ -118,27 +126,23 @@ static int cx22702_set_inversion (struct cx22702_state *state, int inversion) 
	u8 val;



	switch (inversion) {



	case INVERSION_AUTO:

		return -EOPNOTSUPP;



	case INVERSION_ON:

		val = cx22702_readreg(state, 0x0C);

		return cx22702_writereg(state, 0x0C, val | 0x01);



	case INVERSION_OFF:

		val = cx22702_readreg(state, 0x0C);

		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;
@@ -148,45 +152,90 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet 


	val = cx22702_readreg(state, 0x01);

	switch ((val & 0x18) >> 3) {

		case 0: p->constellation =   QPSK; break;

		case 1: p->constellation = QAM_16; break;

		case 2: p->constellation = QAM_64; break;

	case 0:

		p->constellation = QPSK;

		break;

	case 1:

		p->constellation = QAM_16;

		break;

	case 2:

		p->constellation = QAM_64;

		break;

	}

	switch (val & 0x07) {

		case 0: p->hierarchy_information = HIERARCHY_NONE; 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;

	case 0:

		p->hierarchy_information = HIERARCHY_NONE;

		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);

	switch ((val & 0x38) >> 3) {

		case 0: p->code_rate_HP = FEC_1_2; break;

		case 1: 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;

	case 0:

		p->code_rate_HP = FEC_1_2;

		break;

	case 1:

		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) {

		case 0: p->code_rate_LP = FEC_1_2; break;

		case 1: 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;

	case 0:

		p->code_rate_LP = FEC_1_2;

		break;

	case 1:

		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);

	switch ((val & 0x0c) >> 2) {

		case 0: p->guard_interval = GUARD_INTERVAL_1_32; 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;

	case 0:

		p->guard_interval = GUARD_INTERVAL_1_32;

		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 & 0x03) {

		case 0: p->transmission_mode = TRANSMISSION_MODE_2K; break;

		case 1: p->transmission_mode = TRANSMISSION_MODE_8K; break;

	case 0:

		p->transmission_mode = TRANSMISSION_MODE_2K;

		break;

	case 1:

		p->transmission_mode = TRANSMISSION_MODE_8K;

		break;

	}



	return 0;
@@ -197,20 +246,24 @@ static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) 
	struct cx22702_state *state = fe->demodulator_priv;

	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;



	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 */
@@ -219,21 +272,23 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
	/* set 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__);

		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) ||
@@ -247,8 +302,10 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
		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, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );

		cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B)

			& 0xfc);

		cx22702_writereg(state, 0x0C,

			(cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);

		cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */

		dprintk("%s: Autodetecting\n", __func__);

		return 0;
@@ -257,18 +314,32 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
	/* manually programmed values */

	val = 0;

	switch (p->u.ofdm.constellation) {

		case   QPSK: val = (val&0xe7); break;

		case QAM_16: val = (val&0xe7)|0x08; break;

		case QAM_64: val = (val&0xe7)|0x10; break;

	case QPSK:

		val = (val & 0xe7);

		break;

	case QAM_16:

		val = (val & 0xe7) | 0x08;

		break;

	case QAM_64:

		val = (val & 0xe7) | 0x10;

		break;

	default:

		dprintk("%s: invalid constellation\n", __func__);

		return -EINVAL;

	}

	switch (p->u.ofdm.hierarchy_information) {

		case HIERARCHY_NONE: val = (val&0xf8); break;

		case    HIERARCHY_1: val = (val&0xf8)|1; break;

		case    HIERARCHY_2: val = (val&0xf8)|2; break;

		case    HIERARCHY_4: val = (val&0xf8)|3; break;

	case HIERARCHY_NONE:

		val = (val & 0xf8);

		break;

	case HIERARCHY_1:

		val = (val & 0xf8) | 1;

		break;

	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;
@@ -278,22 +349,42 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 
	val = 0;

	switch (p->u.ofdm.code_rate_HP) {

	case FEC_NONE:

		case FEC_1_2: val = (val&0xc7); break;

		case FEC_2_3: val = (val&0xc7)|0x08; break;

		case FEC_3_4: val = (val&0xc7)|0x10; break;

		case FEC_5_6: val = (val&0xc7)|0x18; break;

		case FEC_7_8: val = (val&0xc7)|0x20; break;

	case FEC_1_2:

		val = (val & 0xc7);

		break;

	case FEC_2_3:

		val = (val & 0xc7) | 0x08;

		break;

	case FEC_3_4:

		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) {

	case FEC_NONE:

		case FEC_1_2: val = (val&0xf8); break;

		case FEC_2_3: val = (val&0xf8)|1; break;

		case FEC_3_4: val = (val&0xf8)|2; break;

		case FEC_5_6: val = (val&0xf8)|3; break;

		case FEC_7_8: val = (val&0xf8)|4; break;

	case FEC_1_2:

		val = (val & 0xf8);

		break;

	case FEC_2_3:

		val = (val & 0xf8) | 1;

		break;

	case FEC_3_4:

		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;
@@ -302,24 +393,38 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet 


	val = 0;

	switch (p->u.ofdm.guard_interval) {

		case GUARD_INTERVAL_1_32: val = (val&0xf3); break;

		case GUARD_INTERVAL_1_16: val = (val&0xf3)|0x04; break;

		case  GUARD_INTERVAL_1_8: val = (val&0xf3)|0x08; break;

		case  GUARD_INTERVAL_1_4: val = (val&0xf3)|0x0c; break;

	case GUARD_INTERVAL_1_32:

		val = (val & 0xf3);

		break;

	case GUARD_INTERVAL_1_16:

		val = (val & 0xf3) | 0x04;

		break;

	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) {

		case TRANSMISSION_MODE_2K: val = (val&0xfc); break;

		case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break;

	case TRANSMISSION_MODE_2K:

		val = (val & 0xfc);

		break;

	case TRANSMISSION_MODE_8K:

		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, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 );

	cx22702_writereg(state, 0x0B,

		(cx22702_readreg(state, 0x0B) & 0xfc) | 0x02);

	cx22702_writereg(state, 0x0C,

		(cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);



	/* Begin channel aquisition */

	cx22702_writereg(state, 0x00, 0x01);
@@ -338,10 +443,11 @@ static int cx22702_init (struct dvb_frontend* fe) 


	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, 0xf8, (state->config->output_mode << 1) & 0x02);

	cx22702_writereg(state, 0xf8, (state->config->output_mode << 1)

		& 0x02);



	cx22702_i2c_gate_ctrl(fe, 0);
@@ -394,7 +500,8 @@ static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber) 
	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;
@@ -441,7 +548,8 @@ 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;
@@ -451,7 +559,8 @@ static int cx22702_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par 
	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;
@@ -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 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, 
	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);

drivers/media/dvb/frontends/cx22702.h

+11 −9
Original line number Diff line number Diff line
@@ -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))

extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,

#if defined(CONFIG_DVB_CX22702) || (defined(CONFIG_DVB_CX22702_MODULE) \

	&& defined(MODULE))

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(

	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