diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-12-12 04:58:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-15 21:18:49 -0500 |
commit | 83955556669f69fccfd332b52e9b1796d60c77bd (patch) | |
tree | 29b94e2cb24c5de83523838a7dfaa0fe88cf53b8 /drivers/media/video/gspca/m5602 | |
parent | 37b372e5ebe187037e01885151a0afb546a38520 (diff) |
V4L/DVB (13626): gspca - many subdrivers: Fix some warnings.
- gl860.c:332:15: warning: cast to restricted __le16
- gl860.c:333:15: warning: cast to restricted __le16
- gl860-mi1320.c:348:5: warning: symbol 'mi1320_camera_settings' was not declared. Should it be static?
- gl860-mi2020.c:772:5: warning: symbol 'mi2020_camera_settings' was not declared. Should it be static?
- m5602_ov9650.c:444:7: warning: symbol 'data' shadows an earlier one
- m5602_core.c:84:5: warning: symbol 'm5602_wait_for_i2c' was not declared. Should it be static?
- m5602_core.c:391:6: warning: symbol 'm5602_disconnect' was not declared. Should it be static?
- m5602_s5k4aa.c:530:23: warning: dubious: x | !y
- m5602_s5k4aa.c:575:23: warning: dubious: x | !y
- gspca.c:1196:13: warning: potentially expensive pointer subtraction
- mr97310a.c:70:5: warning: symbol 'force_sensor_type' was not declared. Should it be static?
- ov519.c:2025:4: warning: do-while statement is not a compound statement
- ov519.c:2063:4: warning: do-while statement is not a compound statement
- ov519.c:2089:4: warning: do-while statement is not a compound statement
- ov519.c:1985:34: warning: incorrect type in assignment (different base types)
- sn9c20x.c:1164:5: warning: symbol 'i2c_r1' was not declared. Should it be static?
- sn9c20x.c:1189:5: warning: symbol 'i2c_r2' was not declared. Should it be static?
- sn9c20x.c:2237:27: warning: right shift by bigger than source value
- sn9c20x.c:2237:27: warning: right shift by bigger than source value
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/m5602')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c index 844fc1d886d..4294c75e3b1 100644 --- a/drivers/media/video/gspca/m5602/m5602_core.c +++ b/drivers/media/video/gspca/m5602/m5602_core.c | |||
@@ -81,7 +81,7 @@ int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data) | |||
81 | return (err < 0) ? err : 0; | 81 | return (err < 0) ? err : 0; |
82 | } | 82 | } |
83 | 83 | ||
84 | int m5602_wait_for_i2c(struct sd *sd) | 84 | static int m5602_wait_for_i2c(struct sd *sd) |
85 | { | 85 | { |
86 | int err; | 86 | int err; |
87 | u8 data; | 87 | u8 data; |
@@ -388,7 +388,7 @@ static int m5602_probe(struct usb_interface *intf, | |||
388 | THIS_MODULE); | 388 | THIS_MODULE); |
389 | } | 389 | } |
390 | 390 | ||
391 | void m5602_disconnect(struct usb_interface *intf) | 391 | static void m5602_disconnect(struct usb_interface *intf) |
392 | { | 392 | { |
393 | struct gspca_dev *gspca_dev = usb_get_intfdata(intf); | 393 | struct gspca_dev *gspca_dev = usb_get_intfdata(intf); |
394 | struct sd *sd = (struct sd *) gspca_dev; | 394 | struct sd *sd = (struct sd *) gspca_dev; |
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c index c2739d6605a..923cdd5f7a6 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov9650.c +++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c | |||
@@ -439,7 +439,7 @@ int ov9650_start(struct sd *sd) | |||
439 | err = m5602_write_bridge(sd, res_init_ov9650[i][1], | 439 | err = m5602_write_bridge(sd, res_init_ov9650[i][1], |
440 | res_init_ov9650[i][2]); | 440 | res_init_ov9650[i][2]); |
441 | else if (res_init_ov9650[i][0] == SENSOR) { | 441 | else if (res_init_ov9650[i][0] == SENSOR) { |
442 | u8 data = res_init_ov9650[i][2]; | 442 | data = res_init_ov9650[i][2]; |
443 | err = m5602_write_sensor(sd, | 443 | err = m5602_write_sensor(sd, |
444 | res_init_ov9650[i][1], &data, 1); | 444 | res_init_ov9650[i][1], &data, 1); |
445 | } | 445 | } |
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c index a27afeb6f39..aa2f3c7e2cb 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | |||
@@ -525,7 +525,10 @@ static int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val) | |||
525 | err = m5602_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1); | 525 | err = m5602_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1); |
526 | if (err < 0) | 526 | if (err < 0) |
527 | return err; | 527 | return err; |
528 | data = (data & 0xfe) | !val; | 528 | if (val) |
529 | data &= 0xfe; | ||
530 | else | ||
531 | data |= 0x01; | ||
529 | err = m5602_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1); | 532 | err = m5602_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1); |
530 | return err; | 533 | return err; |
531 | } | 534 | } |
@@ -570,7 +573,10 @@ static int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val) | |||
570 | err = m5602_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1); | 573 | err = m5602_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1); |
571 | if (err < 0) | 574 | if (err < 0) |
572 | return err; | 575 | return err; |
573 | data = (data & 0xfe) | !val; | 576 | if (val) |
577 | data &= 0xfe; | ||
578 | else | ||
579 | data |= 0x01; | ||
574 | err = m5602_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1); | 580 | err = m5602_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1); |
575 | return err; | 581 | return err; |
576 | } | 582 | } |