media: i2c: tvp5150: remove useless variable assignment in tvp5150_set_vbi()

Value assigned to variable _type_ at line 678 is overwritten at line 688
before it can be used. This makes such variable assignment useless.

Remove this variable assignment and fix some coding style issues.

Addresses-Coverity-ID: 1226968

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Gustavo A. R. Silva 2017-06-23 19:37:00 -03:00 коммит произвёл Mauro Carvalho Chehab
Родитель d83bc7b644
Коммит b3d930aaf7
1 изменённых файлов: 11 добавлений и 14 удалений

Просмотреть файл

@ -659,7 +659,7 @@ static int tvp5150_set_vbi(struct v4l2_subdev *sd,
struct tvp5150 *decoder = to_tvp5150(sd);
v4l2_std_id std = decoder->norm;
u8 reg;
int pos=0;
int pos = 0;
if (std == V4L2_STD_ALL) {
dev_err(sd->dev, "VBI can't be configured without knowing number of lines\n");
@ -669,33 +669,30 @@ static int tvp5150_set_vbi(struct v4l2_subdev *sd,
line += 3;
}
if (line<6||line>27)
if (line < 6 || line > 27)
return 0;
while (regs->reg != (u16)-1 ) {
while (regs->reg != (u16)-1) {
if ((type & regs->type.vbi_type) &&
(line>=regs->type.ini_line) &&
(line<=regs->type.end_line)) {
type=regs->type.vbi_type;
(line >= regs->type.ini_line) &&
(line <= regs->type.end_line))
break;
}
regs++;
pos++;
}
if (regs->reg == (u16)-1)
return 0;
type=pos | (flags & 0xf0);
reg=((line-6)<<1)+TVP5150_LINE_MODE_INI;
type = pos | (flags & 0xf0);
reg = ((line - 6) << 1) + TVP5150_LINE_MODE_INI;
if (fields&1) {
if (fields & 1)
tvp5150_write(sd, reg, type);
}
if (fields&2) {
tvp5150_write(sd, reg+1, type);
}
if (fields & 2)
tvp5150_write(sd, reg + 1, type);
return type;
}