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

Commit 89f64758 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6873): Fixes issues listed by checkpatch 



Signed-off-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6fb377f8

drivers/media/dvb/frontends/mt312.c

+73 −58
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ struct mt312_state { 
static int debug;

#define dprintk(args...) \

	do { \

		if (debug) printk(KERN_DEBUG "mt312: " args); \

		if (debug) \

			printk(KERN_DEBUG "mt312: " args); \

	} while (0)



#define MT312_SYS_CLK		90000000UL	/* 90 MHz */
@@ -172,7 +173,8 @@ static int mt312_get_symbol_rate(struct mt312_state* state, u32 *sr) 
	if ((ret = mt312_readreg(state, SYM_RATE_H, &sym_rate_h)) < 0)

		return ret;



	if (sym_rate_h & 0x80) {	/* symbol rate search was used */

	if (sym_rate_h & 0x80) {

		/* symbol rate search was used */

		if ((ret = mt312_writereg(state, MON_CTRL, 0x03)) < 0)

			return ret;
@@ -192,7 +194,8 @@ static int mt312_get_symbol_rate(struct mt312_state* state, u32 *sr) 


		dec_ratio = ((buf[0] >> 5) & 0x07) * 32;



		if ((ret = mt312_read(state, SYM_RAT_OP_H, buf, sizeof(buf))) < 0)

		if ((ret = mt312_read(state, SYM_RAT_OP_H, buf,

				     sizeof(buf))) < 0)

			return ret;



		sym_rat_op = (buf[0] << 8) | buf[1];
@@ -231,7 +234,8 @@ static int mt312_initfe(struct dvb_frontend* fe) 
	u8 buf[2];



	/* wake up */

	if ((ret = mt312_writereg(state, CONFIG, (state->frequency == 60 ? 0x88 : 0x8c))) < 0)

	if ((ret = mt312_writereg(state, CONFIG,

			(state->frequency == 60 ? 0x88 : 0x8c))) < 0)

		return ret;



	/* wait at least 150 usec */
@@ -241,17 +245,20 @@ static int mt312_initfe(struct dvb_frontend* fe) 
	if ((ret = mt312_reset(state, 1)) < 0)

		return ret;



// Per datasheet, write correct values. 09/28/03 ACCJr.

// If we don't do this, we won't get FE_HAS_VITERBI in the VP310.

/* Per datasheet, write correct values. 09/28/03 ACCJr.

 * If we don't do this, we won't get FE_HAS_VITERBI in the VP310. */

	{

		u8 buf_def[8]={0x14, 0x12, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00};

		u8 buf_def[8] = { 0x14, 0x12, 0x03, 0x02,

				  0x01, 0x00, 0x00, 0x00 };



		if ((ret = mt312_write(state, VIT_SETUP, buf_def, sizeof(buf_def))) < 0)

		if ((ret = mt312_write(state, VIT_SETUP, buf_def,

				       sizeof(buf_def))) < 0)

			return ret;

	}



	/* SYS_CLK */

	buf[0] = mt312_div((state->frequency == 60 ? MT312_LPOWER_SYS_CLK : MT312_SYS_CLK) * 2, 1000000);

	buf[0] = mt312_div((state->frequency == 60 ? MT312_LPOWER_SYS_CLK :

				MT312_SYS_CLK) * 2, 1000000);



	/* DISEQC_RATIO */

	buf[1] = mt312_div(MT312_PLL_CLK, 15000 * 4);
@@ -303,8 +310,8 @@ static int mt312_send_master_cmd(struct dvb_frontend* fe, 


	/* set DISEQC_MODE[2:0] to zero if a return message is expected */

	if (c->msg[0] & 0x02)

		if ((ret =

		     mt312_writereg(state, DISEQC_MODE, (diseqc_mode & 0x40))) < 0)

		if ((ret = mt312_writereg(state, DISEQC_MODE,

					  (diseqc_mode & 0x40))) < 0)

			return ret;



	return 0;
@@ -376,7 +383,8 @@ static int mt312_read_status(struct dvb_frontend* fe, fe_status_t *s) 
	if ((ret = mt312_read(state, QPSK_STAT_H, status, sizeof(status))) < 0)

		return ret;



	dprintk(KERN_DEBUG "QPSK_STAT_H: 0x%02x, QPSK_STAT_L: 0x%02x, FEC_STATUS: 0x%02x\n", status[0], status[1], status[2]);

	dprintk(KERN_DEBUG "QPSK_STAT_H: 0x%02x, QPSK_STAT_L: 0x%02x,"

		" FEC_STATUS: 0x%02x\n", status[0], status[1], status[2]);



	if (status[0] & 0xc0)

		*s |= FE_HAS_SIGNAL;	/* signal noise ratio */
@@ -406,7 +414,8 @@ static int mt312_read_ber(struct dvb_frontend* fe, u32 *ber) 
	return 0;

}



static int mt312_read_signal_strength(struct dvb_frontend* fe, u16 *signal_strength)

static int mt312_read_signal_strength(struct dvb_frontend *fe,

				      u16 *signal_strength)

{

	struct mt312_state *state = fe->demodulator_priv;

	int ret;
@@ -491,22 +500,24 @@ static int mt312_set_frontend(struct dvb_frontend* fe, 


	switch (state->id) {

	case ID_VP310:

	// For now we will do this only for the VP310.

	// It should be better for the mt312 as well, but tunning will be slower. ACCJr 09/29/03

	/* For now we will do this only for the VP310.

	 * It should be better for the mt312 as well,

	 * but tuning will be slower. ACCJr 09/29/03

	 */

		ret = mt312_readreg(state, CONFIG, &config_val);

		if (ret < 0)

			return ret;

		if (p->u.qpsk.symbol_rate >= 30000000) //Note that 30MS/s should use 90MHz

		{

			if ((config_val & 0x0c) == 0x08) { //We are running 60MHz

		if (p->u.qpsk.symbol_rate >= 30000000) {

			/* Note that 30MS/s should use 90MHz */

			if ((config_val & 0x0c) == 0x08) {

				/* We are running 60MHz */

				state->frequency = 90;

				if ((ret = mt312_initfe(fe)) < 0)

					return ret;

			}

		}

		else

		{

			if ((config_val & 0x0c) == 0x0C) { //We are running 90MHz

		} else {

			if ((config_val & 0x0c) == 0x0C) {

				/* We are running 90MHz */

				state->frequency = 60;

				if ((ret = mt312_initfe(fe)) < 0)

					return ret;
@@ -523,7 +534,8 @@ static int mt312_set_frontend(struct dvb_frontend* fe, 


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

	}



	/* sr = (u16)(sr * 256.0 / 1000000.0) */
@@ -602,7 +614,8 @@ static int mt312_sleep(struct dvb_frontend* fe) 
	return 0;

}



static int mt312_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)

static int mt312_get_tune_settings(struct dvb_frontend *fe,

		struct dvb_frontend_tune_settings *fesettings)

{

	fesettings->min_delay_ms = 50;

	fesettings->step_size = 0;
@@ -674,7 +687,8 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config, 
		goto error;



	/* create dvb_frontend */

	memcpy(&state->frontend.ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));

	memcpy(&state->frontend.ops, &vp310_mt312_ops,

		sizeof(struct dvb_frontend_ops));

	state->frontend.demodulator_priv = state;



	switch (state->id) {
@@ -687,7 +701,8 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config, 
		state->frequency = 60;

		break;

	default:

		printk (KERN_WARNING "Only Zarlink VP310/MT312 are supported chips.\n");

		printk(KERN_WARNING "Only Zarlink VP310/MT312"

			" are supported chips.\n");

		goto error;

	}
@@ -697,6 +712,7 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config, 
	kfree(state);

	return NULL;

}

EXPORT_SYMBOL(vp310_mt312_attach);



module_param(debug, int, 0644);

MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
@@ -705,4 +721,3 @@ MODULE_DESCRIPTION("Zarlink VP310/MT312 DVB-S Demodulator driver"); 
MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");

MODULE_LICENSE("GPL");

EXPORT_SYMBOL(vp310_mt312_attach);

drivers/media/dvb/frontends/mt312.h

+7 −8
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 


#include <linux/dvb/frontend.h>



struct mt312_config

{

struct mt312_config {

	/* the demodulator's i2c address */

	u8 demod_address;

};
@@ -38,12 +37,12 @@ struct mt312_config 
struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,

					struct i2c_adapter *i2c);

#else

static inline struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,

					struct i2c_adapter* i2c)

static inline struct dvb_frontend *vp310_mt312_attach(

	const struct mt312_config *config, struct i2c_adapter *i2c)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);

	return NULL;

}

#endif // CONFIG_DVB_MT312

#endif /* CONFIG_DVB_MT312 */



#endif // MT312_H
 
#endif /* MT312_H */