Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Gustavo A. R. Silva and committed by
Mauro Carvalho Chehab
b3d930aa d83bc7b6

+11 -14
+11 -14
drivers/media/i2c/tvp5150.c
··· 659 659 struct tvp5150 *decoder = to_tvp5150(sd); 660 660 v4l2_std_id std = decoder->norm; 661 661 u8 reg; 662 - int pos=0; 662 + int pos = 0; 663 663 664 664 if (std == V4L2_STD_ALL) { 665 665 dev_err(sd->dev, "VBI can't be configured without knowing number of lines\n"); ··· 669 669 line += 3; 670 670 } 671 671 672 - if (line<6||line>27) 672 + if (line < 6 || line > 27) 673 673 return 0; 674 674 675 - while (regs->reg != (u16)-1 ) { 675 + while (regs->reg != (u16)-1) { 676 676 if ((type & regs->type.vbi_type) && 677 - (line>=regs->type.ini_line) && 678 - (line<=regs->type.end_line)) { 679 - type=regs->type.vbi_type; 677 + (line >= regs->type.ini_line) && 678 + (line <= regs->type.end_line)) 680 679 break; 681 - } 682 680 683 681 regs++; 684 682 pos++; 685 683 } 684 + 686 685 if (regs->reg == (u16)-1) 687 686 return 0; 688 687 689 - type=pos | (flags & 0xf0); 690 - reg=((line-6)<<1)+TVP5150_LINE_MODE_INI; 688 + type = pos | (flags & 0xf0); 689 + reg = ((line - 6) << 1) + TVP5150_LINE_MODE_INI; 691 690 692 - if (fields&1) { 691 + if (fields & 1) 693 692 tvp5150_write(sd, reg, type); 694 - } 695 693 696 - if (fields&2) { 697 - tvp5150_write(sd, reg+1, type); 698 - } 694 + if (fields & 2) 695 + tvp5150_write(sd, reg + 1, type); 699 696 700 697 return type; 701 698 }