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

Commit a2354737 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx24110: Simplify error handling at cx24110_set_fec() 



move the return to happen before the logic. This way, we can
avoid one extra identation.

This also fixes an identation issue on this function.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 6deaca2b

drivers/media/dvb-frontends/cx24110.c

+11 −13
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver 


static int cx24110_set_fec(struct cx24110_state* state, fe_code_rate_t fec)

{

/* fixme (low): error handling */



	static const int rate[FEC_AUTO] = {-1,    1,    2,    3,    5,    7, -1};

	static const int g1[FEC_AUTO]   = {-1, 0x01, 0x02, 0x05, 0x15, 0x45, -1};

	static const int g2[FEC_AUTO]   = {-1, 0x01, 0x03, 0x06, 0x1a, 0x7a, -1};
@@ -208,7 +206,9 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) 
	} else {

		cx24110_writereg(state, 0x37, cx24110_readreg(state, 0x37) | 0x20);

		/* set AcqVitDis bit */

		if (rate[fec] > 0) {

		if (rate[fec] < 0)

			return -EINVAL;



		cx24110_writereg(state, 0x05, (cx24110_readreg(state, 0x05) & 0xf0) | rate[fec]);

		/* set nominal Viterbi rate */

		cx24110_writereg(state, 0x22, (cx24110_readreg(state, 0x22) & 0xf0) | rate[fec]);
@@ -216,8 +216,6 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) 
		cx24110_writereg(state, 0x1a, g1[fec]);

		cx24110_writereg(state, 0x1b, g2[fec]);

		/* not sure if this is the right way: I always used AutoAcq mode */

	   } else

		   return -EINVAL;

	}

	return 0;

}