leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-11-05 10:00:45 -02:00
parent 6deaca2bc3
commit a235473742
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/dvb-frontends/cx24110.c
View File

@ -177,10 +177,8 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver
return 0; return 0;
} }
static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) 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 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 g1[FEC_AUTO] = {-1, 0x01, 0x02, 0x05, 0x15, 0x45, -1};
static const int g2[FEC_AUTO] = {-1, 0x01, 0x03, 0x06, 0x1a, 0x7a, -1}; static const int g2[FEC_AUTO] = {-1, 0x01, 0x03, 0x06, 0x1a, 0x7a, -1};
@ -208,16 +206,16 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
} else { } else {
cx24110_writereg(state, 0x37, cx24110_readreg(state, 0x37) | 0x20); cx24110_writereg(state, 0x37, cx24110_readreg(state, 0x37) | 0x20);
/* set AcqVitDis bit */ /* set AcqVitDis bit */
if (rate[fec] > 0) { if (rate[fec] < 0)
cx24110_writereg(state, 0x05, (cx24110_readreg(state, 0x05) & 0xf0) | rate[fec]); return -EINVAL;
/* set nominal Viterbi rate */
cx24110_writereg(state, 0x22, (cx24110_readreg(state, 0x22) & 0xf0) | rate[fec]); cx24110_writereg(state, 0x05, (cx24110_readreg(state, 0x05) & 0xf0) | rate[fec]);
/* set current Viterbi rate */ /* set nominal Viterbi rate */
cx24110_writereg(state, 0x1a, g1[fec]); cx24110_writereg(state, 0x22, (cx24110_readreg(state, 0x22) & 0xf0) | rate[fec]);
cx24110_writereg(state, 0x1b, g2[fec]); /* set current Viterbi rate */
/* not sure if this is the right way: I always used AutoAcq mode */ cx24110_writereg(state, 0x1a, g1[fec]);
} else cx24110_writereg(state, 0x1b, g2[fec]);
return -EINVAL; /* not sure if this is the right way: I always used AutoAcq mode */
} }
return 0; return 0;
} }