Commit b3d930aa authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Mauro Carvalho Chehab

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: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent d83bc7b6
...@@ -659,7 +659,7 @@ static int tvp5150_set_vbi(struct v4l2_subdev *sd, ...@@ -659,7 +659,7 @@ static int tvp5150_set_vbi(struct v4l2_subdev *sd,
struct tvp5150 *decoder = to_tvp5150(sd); struct tvp5150 *decoder = to_tvp5150(sd);
v4l2_std_id std = decoder->norm; v4l2_std_id std = decoder->norm;
u8 reg; u8 reg;
int pos=0; int pos = 0;
if (std == V4L2_STD_ALL) { if (std == V4L2_STD_ALL) {
dev_err(sd->dev, "VBI can't be configured without knowing number of lines\n"); 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, ...@@ -669,33 +669,30 @@ static int tvp5150_set_vbi(struct v4l2_subdev *sd,
line += 3; line += 3;
} }
if (line<6||line>27) if (line < 6 || line > 27)
return 0; return 0;
while (regs->reg != (u16)-1 ) { while (regs->reg != (u16)-1) {
if ((type & regs->type.vbi_type) && if ((type & regs->type.vbi_type) &&
(line>=regs->type.ini_line) && (line >= regs->type.ini_line) &&
(line<=regs->type.end_line)) { (line <= regs->type.end_line))
type=regs->type.vbi_type;
break; break;
}
regs++; regs++;
pos++; pos++;
} }
if (regs->reg == (u16)-1) if (regs->reg == (u16)-1)
return 0; return 0;
type=pos | (flags & 0xf0); type = pos | (flags & 0xf0);
reg=((line-6)<<1)+TVP5150_LINE_MODE_INI; reg = ((line - 6) << 1) + TVP5150_LINE_MODE_INI;
if (fields&1) { if (fields & 1)
tvp5150_write(sd, reg, type); tvp5150_write(sd, reg, type);
}
if (fields&2) { if (fields & 2)
tvp5150_write(sd, reg+1, type); tvp5150_write(sd, reg + 1, type);
}
return type; return type;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment