Commit 2e89a5e0 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab
Browse files

[media] cx24120: fix codingstyle issue first round 



Mauro pointed out some coding style issues in his review.
This patch fixes them.

Signed-off-by: default avatarPatrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent b8fe6e2c

drivers/media/dvb-frontends/cx24120.c

+135 −152
Original line number Diff line number Diff line
@@ -36,34 +36,34 @@ 
#define CX24120_FIRMWARE "dvb-fe-cx24120-1.20.58.2.fw"



/* cx24120 i2c registers  */

#define CX24120_REG_CMD_START	(0x00)		/* write cmd_id */

#define CX24120_REG_CMD_ARGS	(0x01)		/* write command arguments */

#define CX24120_REG_CMD_END	(0x1f)		/* write 0x01 for end */

#define CX24120_REG_CMD_START	0x00		/* write cmd_id */

#define CX24120_REG_CMD_ARGS	0x01		/* write command arguments */

#define CX24120_REG_CMD_END	0x1f		/* write 0x01 for end */



#define CX24120_REG_MAILBOX	(0x33)

#define CX24120_REG_FREQ3	(0x34)		/* frequency */

#define CX24120_REG_FREQ2	(0x35)

#define CX24120_REG_FREQ1	(0x36)

#define CX24120_REG_MAILBOX	0x33

#define CX24120_REG_FREQ3	0x34		/* frequency */

#define CX24120_REG_FREQ2	0x35

#define CX24120_REG_FREQ1	0x36



#define CX24120_REG_FECMODE	(0x39)		/* FEC status */

#define CX24120_REG_STATUS	(0x3a)		/* Tuner status */

#define CX24120_REG_SIGSTR_H	(0x3a)		/* Signal strength high */

#define CX24120_REG_SIGSTR_L	(0x3b)		/* Signal strength low byte */

#define CX24120_REG_QUALITY_H	(0x40)		/* SNR high byte */

#define CX24120_REG_QUALITY_L	(0x41)		/* SNR low byte */

#define CX24120_REG_FECMODE	0x39		/* FEC status */

#define CX24120_REG_STATUS	0x3a		/* Tuner status */

#define CX24120_REG_SIGSTR_H	0x3a		/* Signal strength high */

#define CX24120_REG_SIGSTR_L	0x3b		/* Signal strength low byte */

#define CX24120_REG_QUALITY_H	0x40		/* SNR high byte */

#define CX24120_REG_QUALITY_L	0x41		/* SNR low byte */



#define CX24120_REG_BER_HH	(0x47)		/* BER high byte of high word */

#define CX24120_REG_BER_HL	(0x48)		/* BER low byte of high word */

#define CX24120_REG_BER_LH	(0x49)		/* BER high byte of low word */

#define CX24120_REG_BER_LL	(0x4a)		/* BER low byte of low word */

#define CX24120_REG_BER_HH	0x47		/* BER high byte of high word */

#define CX24120_REG_BER_HL	0x48		/* BER low byte of high word */

#define CX24120_REG_BER_LH	0x49		/* BER high byte of low word */

#define CX24120_REG_BER_LL	0x4a		/* BER low byte of low word */



#define CX24120_REG_UCB_H	(0x50)		/* UCB high byte */

#define CX24120_REG_UCB_L	(0x51)		/* UCB low byte  */

#define CX24120_REG_UCB_H	0x50		/* UCB high byte */

#define CX24120_REG_UCB_L	0x51		/* UCB low byte  */



#define CX24120_REG_CLKDIV	(0xe6)

#define CX24120_REG_RATEDIV	(0xf0)

#define CX24120_REG_CLKDIV	0xe6

#define CX24120_REG_RATEDIV	0xf0



#define CX24120_REG_REVISION	(0xff)		/* Chip revision (ro) */

#define CX24120_REG_REVISION	0xff		/* Chip revision (ro) */





/* Command messages */
@@ -94,19 +94,19 @@ enum command_message_id { 
#define CX24120_MAX_CMD_LEN	30



/* pilot mask */

#define CX24120_PILOT_OFF	(0x00)

#define CX24120_PILOT_ON	(0x40)

#define CX24120_PILOT_AUTO	(0x80)

#define CX24120_PILOT_OFF	0x00

#define CX24120_PILOT_ON	0x40

#define CX24120_PILOT_AUTO	0x80



/* signal status */

#define CX24120_HAS_SIGNAL	(0x01)

#define CX24120_HAS_CARRIER	(0x02)

#define CX24120_HAS_VITERBI	(0x04)

#define CX24120_HAS_LOCK	(0x08)

#define CX24120_HAS_UNK1	(0x10)

#define CX24120_HAS_UNK2	(0x20)

#define CX24120_STATUS_MASK	(0x0f)

#define CX24120_SIGNAL_MASK	(0xc0)

#define CX24120_HAS_SIGNAL	0x01

#define CX24120_HAS_CARRIER	0x02

#define CX24120_HAS_VITERBI	0x04

#define CX24120_HAS_LOCK	0x08

#define CX24120_HAS_UNK1	0x10

#define CX24120_HAS_UNK2	0x20

#define CX24120_STATUS_MASK	0x0f

#define CX24120_SIGNAL_MASK	0xc0



#define info(args...) pr_info("cx24120: " args)

#define err(args...)  pr_err("cx24120: ### ERROR: " args)
@@ -164,16 +164,18 @@ static int cx24120_readreg(struct cx24120_state *state, u8 reg) 
		{	.addr = state->config->i2c_addr,

			.flags = 0,

			.len = 1,

			.buf = &reg	},



		{	.addr = state->config->i2c_addr,

			.buf = &reg

		}, {

			.addr = state->config->i2c_addr,

			.flags = I2C_M_RD,

			.len = 1,

			.buf = &buf	}

			.buf = &buf

		}

	};



	ret = i2c_transfer(state->i2c, msg, 2);

	if (ret != 2) {

		err("Read error: reg=0x%02x, ret=0x%02x)\n", reg, ret);

		err("Read error: reg=0x%02x, ret=%i)\n", reg, ret);

		return ret;

	}
@@ -192,7 +194,8 @@ static int cx24120_writereg(struct cx24120_state *state, u8 reg, u8 data) 
		.addr = state->config->i2c_addr,

		.flags = 0,

		.buf = buf,

		.len = 2 };

		.len = 2

	};

	int ret;



	ret = i2c_transfer(state->i2c, &msg, 1);
@@ -246,9 +249,8 @@ static int cx24120_writeregN(struct cx24120_state *state, 
		}



		dev_dbg(&state->i2c->dev,

			"%s: reg=0x%02x; data=0x%02x,0x%02x,0x%02x,0x%02x\n",

			__func__, reg,

			msg.buf[1], msg.buf[2], msg.buf[3], msg.buf[4]);

			"%s: reg=0x%02x; data=%*ph\n",

			__func__, reg, msg.len, msg.buf+1);

	}



	ret = 0;
@@ -268,8 +270,7 @@ struct dvb_frontend *cx24120_attach(const struct cx24120_config *config, 
	int demod_rev;



	info("Conexant cx24120/cx24118 - DVBS/S2 Satellite demod/tuner\n");

	state = kzalloc(sizeof(struct cx24120_state),

						GFP_KERNEL);

	state = kzalloc(sizeof(struct cx24120_state), GFP_KERNEL);

	if (state == NULL) {

		err("Unable to allocate memory for cx24120_state\n");

		goto error;
@@ -835,7 +836,6 @@ static void cx24120_set_clock_ratios(struct dvb_frontend *fe) 
		return;

	}





	/* Read current values? */

	cmd.id = CMD_CLOCK_READ;

	cmd.len = 1;
@@ -855,8 +855,6 @@ static void cx24120_set_clock_ratios(struct dvb_frontend *fe) 
		clock_ratios_table[idx].n_rat,

		clock_ratios_table[idx].rate);







	/* Set the clock */

	cmd.id = CMD_CLOCK_SET;

	cmd.len = 10;
@@ -872,7 +870,6 @@ static void cx24120_set_clock_ratios(struct dvb_frontend *fe) 
	cmd.arg[9] = (clock_ratios_table[idx].rate >> 0) & 0xff;



	cx24120_message_send(state, &cmd);



}
@@ -902,15 +899,13 @@ static int cx24120_set_inversion(struct cx24120_state *state, 
	return 0;

}



/* FEC lookup table for tuning

 * Some DVB-S2 val's have been found by trial

 * and error. Sofar it seems to match up with

 * the contents of the REG_FECMODE after tuning

 * The rest will probably be the same but would

 * need testing.

 * Anything not in the table will run with

 * FEC_AUTO and take a while longer to tune in

 * ( c.500ms instead of 30ms )

/*

 * FEC lookup table for tuning Some DVB-S2 val's have been found by

 * trial and error. Sofar it seems to match up with the contents of

 * the REG_FECMODE after tuning The rest will probably be the same but

 * would need testing.  Anything not in the table will run with

 * FEC_AUTO and take a while longer to tune in ( c.500ms instead of

 * 30ms )

 */

static struct cx24120_modfec_table {

	fe_delivery_system_t delsys;
@@ -958,7 +953,6 @@ static int cx24120_set_fec(struct cx24120_state *state, 
		return 0;

	}





	if (state->dnxt.delsys == SYS_DVBS2) {

		/* DVBS2 auto is 0x00/0x00 */

		state->dnxt.fec_mask = 0x00;
@@ -977,8 +971,7 @@ static int cx24120_set_fec(struct cx24120_state *state, 
static int cx24120_set_pilot(struct cx24120_state *state,

		fe_pilot_t pilot) {



	dev_dbg(&state->i2c->dev,

		"%s(%d)\n", __func__, pilot);

	dev_dbg(&state->i2c->dev, "%s(%d)\n", __func__, pilot);



	/* Pilot only valid in DVBS2 */

	if (state->dnxt.delsys != SYS_DVBS2) {
@@ -986,7 +979,6 @@ static int cx24120_set_pilot(struct cx24120_state *state, 
		return 0;

	}





	switch (pilot) {

	case PILOT_OFF:

		state->dnxt.pilot_val = CX24120_PILOT_OFF;
@@ -1077,7 +1069,6 @@ static int cx24120_set_frontend(struct dvb_frontend *fe) 
		break;

	}





	state->dnxt.delsys = c->delivery_system;

	state->dnxt.modulation = c->modulation;

	state->dnxt.frequency = c->frequency;
@@ -1099,7 +1090,6 @@ static int cx24120_set_frontend(struct dvb_frontend *fe) 
	if (ret !=  0)

		return ret;





	/* discard the 'current' tuning parameters and prepare to tune */

	cx24120_clone_params(fe);
@@ -1123,8 +1113,6 @@ static int cx24120_set_frontend(struct dvb_frontend *fe) 
		"%s: Inversion   = %d (val = 0x%02x)\n", __func__,

		state->dcur.inversion, state->dcur.inversion_val);







	/* Tune in */

	cmd.id = CMD_TUNEREQUEST;

	cmd.len = 15;
@@ -1144,7 +1132,6 @@ static int cx24120_set_frontend(struct dvb_frontend *fe) 
	cmd.arg[13] = state->dcur.clkdiv;

	cmd.arg[14] = 0;





	/* Send tune command */

	ret = cx24120_message_send(state, &cmd);

	if (ret != 0)
@@ -1183,17 +1170,13 @@ static int cx24120_set_frontend(struct dvb_frontend *fe) 
		delay_cnt -= 20;

	}





	/* Fail to tune */

	dev_dbg(&state->i2c->dev, "%s: Tuning failed\n",

		__func__);

	dev_dbg(&state->i2c->dev, "%s: Tuning failed\n", __func__);



	return -EINVAL;





tuned:

	dev_dbg(&state->i2c->dev, "%s: Tuning successful\n",

		__func__);

	dev_dbg(&state->i2c->dev, "%s: Tuning successful\n", __func__);



	/* Set clock ratios */

	cx24120_set_clock_ratios(fe);