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

media: lgdt330x: do some cleanups at status logic

Browse Source 
Simplify a few ifs there.

While here, add debug messages for the 8-vsb and qam log status
flags.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-03-09 10:53:31 -05:00 committed by Mauro Carvalho Chehab
parent 23ba635d45
commit db9c1007bc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/dvb-frontends/lgdt330x.c
View File

@ -515,10 +515,8 @@ static int lgdt3302_read_status(struct dvb_frontend *fe,
*status |= FE_HAS_SYNC; *status |= FE_HAS_SYNC;
/* FEC error status */ /* FEC error status */
if ((buf[2] & 0x0c) == 0x08) { if ((buf[2] & 0x0c) == 0x08)
*status |= FE_HAS_LOCK; *status |= FE_HAS_LOCK | FE_HAS_VITERBI;
*status |= FE_HAS_VITERBI;
}
/* Carrier Recovery Lock Status Register */ /* Carrier Recovery Lock Status Register */
i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1); i2c_read_demod_bytes(state, CARRIER_LOCK, buf, 1);
@ -578,6 +576,8 @@ static int lgdt3303_read_status(struct dvb_frontend *fe,
else else
break; break;
i2c_read_demod_bytes(state, 0x8a, buf, 1); i2c_read_demod_bytes(state, 0x8a, buf, 1);
dprintk(state, "QAM LOCK = 0x%02x\n", buf[0]);
if ((buf[0] & 0x04) == 0x04) if ((buf[0] & 0x04) == 0x04)
*status |= FE_HAS_SYNC; *status |= FE_HAS_SYNC;
if ((buf[0] & 0x01) == 0x01) if ((buf[0] & 0x01) == 0x01)
@ -591,12 +591,12 @@ static int lgdt3303_read_status(struct dvb_frontend *fe,
else else
break; break;
i2c_read_demod_bytes(state, 0x38, buf, 1); i2c_read_demod_bytes(state, 0x38, buf, 1);
dprintk(state, "8-VSB LOCK = 0x%02x\n", buf[0]);
if ((buf[0] & 0x02) == 0x00) if ((buf[0] & 0x02) == 0x00)
*status |= FE_HAS_SYNC; *status |= FE_HAS_SYNC;
if ((buf[0] & 0x01) == 0x01) { if ((buf[0] & 0xfd) == 0x01)
*status |= FE_HAS_LOCK; *status |= FE_HAS_VITERBI | FE_HAS_LOCK;
*status |= FE_HAS_VITERBI;
}
break; break;
default: default:
dev_warn(&state->client->dev, dev_warn(&state->client->dev,