mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-01 07:56:44 +07:00
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>
This commit is contained in:
parent
37b372e5eb
commit
8395555666
@ -345,7 +345,7 @@ static int mi1320_configure_alt(struct gspca_dev *gspca_dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mi1320_camera_settings(struct gspca_dev *gspca_dev)
|
||||
static int mi1320_camera_settings(struct gspca_dev *gspca_dev)
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
|
||||
|
@ -769,7 +769,7 @@ static int mi2020_configure_alt(struct gspca_dev *gspca_dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mi2020_camera_settings(struct gspca_dev *gspca_dev)
|
||||
static int mi2020_camera_settings(struct gspca_dev *gspca_dev)
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
|
||||
|
@ -40,7 +40,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
||||
static void sd_callback(struct gspca_dev *gspca_dev);
|
||||
|
||||
static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
|
||||
s32 vendor_id, s32 product_id);
|
||||
u16 vendor_id, u16 product_id);
|
||||
|
||||
/*============================ driver options ==============================*/
|
||||
|
||||
@ -326,11 +326,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
struct cam *cam;
|
||||
s32 vendor_id, product_id;
|
||||
u16 vendor_id, product_id;
|
||||
|
||||
/* Get USB VendorID and ProductID */
|
||||
vendor_id = le16_to_cpu(id->idVendor);
|
||||
product_id = le16_to_cpu(id->idProduct);
|
||||
vendor_id = id->idVendor;
|
||||
product_id = id->idProduct;
|
||||
|
||||
sd->nbRightUp = 1;
|
||||
sd->nbIm = -1;
|
||||
@ -673,7 +673,7 @@ void fetch_idxdata(struct gspca_dev *gspca_dev, struct idxdata *tbl, int len)
|
||||
}
|
||||
|
||||
static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
|
||||
s32 vendor_id, s32 product_id)
|
||||
u16 vendor_id, u16 product_id)
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
u8 probe, nb26, nb96, nOV, ntry;
|
||||
|
@ -1175,12 +1175,14 @@ static int vidioc_queryctrl(struct file *file, void *priv,
|
||||
continue;
|
||||
ctrls = &gspca_dev->sd_desc->ctrls[i];
|
||||
}
|
||||
if (ctrls == NULL)
|
||||
return -EINVAL;
|
||||
} else {
|
||||
ctrls = get_ctrl(gspca_dev, id);
|
||||
if (ctrls == NULL)
|
||||
return -EINVAL;
|
||||
i = ctrls - gspca_dev->sd_desc->ctrls;
|
||||
}
|
||||
if (ctrls == NULL)
|
||||
return -EINVAL;
|
||||
memcpy(q_ctrl, ctrls, sizeof *q_ctrl);
|
||||
if (gspca_dev->ctrl_inac & (1 << i))
|
||||
q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;
|
||||
|
@ -81,7 +81,7 @@ int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data)
|
||||
return (err < 0) ? err : 0;
|
||||
}
|
||||
|
||||
int m5602_wait_for_i2c(struct sd *sd)
|
||||
static int m5602_wait_for_i2c(struct sd *sd)
|
||||
{
|
||||
int err;
|
||||
u8 data;
|
||||
@ -388,7 +388,7 @@ static int m5602_probe(struct usb_interface *intf,
|
||||
THIS_MODULE);
|
||||
}
|
||||
|
||||
void m5602_disconnect(struct usb_interface *intf)
|
||||
static void m5602_disconnect(struct usb_interface *intf)
|
||||
{
|
||||
struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
|
@ -439,7 +439,7 @@ int ov9650_start(struct sd *sd)
|
||||
err = m5602_write_bridge(sd, res_init_ov9650[i][1],
|
||||
res_init_ov9650[i][2]);
|
||||
else if (res_init_ov9650[i][0] == SENSOR) {
|
||||
u8 data = res_init_ov9650[i][2];
|
||||
data = res_init_ov9650[i][2];
|
||||
err = m5602_write_sensor(sd,
|
||||
res_init_ov9650[i][1], &data, 1);
|
||||
}
|
||||
|
@ -525,7 +525,10 @@ static int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
|
||||
err = m5602_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
|
||||
if (err < 0)
|
||||
return err;
|
||||
data = (data & 0xfe) | !val;
|
||||
if (val)
|
||||
data &= 0xfe;
|
||||
else
|
||||
data |= 0x01;
|
||||
err = m5602_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
|
||||
return err;
|
||||
}
|
||||
@ -570,7 +573,10 @@ static int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
|
||||
err = m5602_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
|
||||
if (err < 0)
|
||||
return err;
|
||||
data = (data & 0xfe) | !val;
|
||||
if (val)
|
||||
data &= 0xfe;
|
||||
else
|
||||
data |= 0x01;
|
||||
err = m5602_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
|
||||
return err;
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ MODULE_DESCRIPTION("GSPCA/Mars-Semi MR97310A USB Camera Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
/* global parameters */
|
||||
int force_sensor_type = -1;
|
||||
static int force_sensor_type = -1;
|
||||
module_param(force_sensor_type, int, 0644);
|
||||
MODULE_PARM_DESC(force_sensor_type, "Force sensor type (-1 (auto), 0 or 1)");
|
||||
|
||||
|
@ -1982,7 +1982,7 @@ static int ov518_reg_w32(struct sd *sd, __u16 index, u32 value, int n)
|
||||
{
|
||||
int ret;
|
||||
|
||||
*((u32 *)sd->gspca_dev.usb_buf) = __cpu_to_le32(value);
|
||||
*((__le32 *) sd->gspca_dev.usb_buf) = __cpu_to_le32(value);
|
||||
|
||||
ret = usb_control_msg(sd->gspca_dev.dev,
|
||||
usb_sndctrlpipe(sd->gspca_dev.dev, 0),
|
||||
@ -2021,9 +2021,9 @@ static int ov511_i2c_w(struct sd *sd, __u8 reg, __u8 value)
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
do
|
||||
do {
|
||||
rc = reg_r(sd, R511_I2C_CTL);
|
||||
while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
|
||||
} while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
|
||||
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
@ -2055,9 +2055,9 @@ static int ov511_i2c_r(struct sd *sd, __u8 reg)
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
do
|
||||
do {
|
||||
rc = reg_r(sd, R511_I2C_CTL);
|
||||
while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
|
||||
} while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
|
||||
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
@ -2081,9 +2081,9 @@ static int ov511_i2c_r(struct sd *sd, __u8 reg)
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
do
|
||||
do {
|
||||
rc = reg_r(sd, R511_I2C_CTL);
|
||||
while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
|
||||
} while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
|
||||
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
@ -1158,7 +1158,7 @@ static int i2c_w2(struct gspca_dev *gspca_dev, u8 reg, u16 val)
|
||||
return i2c_w(gspca_dev, row);
|
||||
}
|
||||
|
||||
int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
|
||||
static int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
u8 row[8];
|
||||
@ -1183,7 +1183,7 @@ int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
|
||||
static int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
u8 row[8];
|
||||
@ -2175,8 +2175,7 @@ static void configure_sensor_output(struct gspca_dev *gspca_dev, int mode)
|
||||
}
|
||||
|
||||
#define HW_WIN(mode, hstart, vstart) \
|
||||
((const u8 []){hstart & 0xff, hstart >> 8, \
|
||||
vstart & 0xff, vstart >> 8, \
|
||||
((const u8 []){hstart, 0, vstart, 0, \
|
||||
(mode & MODE_SXGA ? 1280 >> 4 : 640 >> 4), \
|
||||
(mode & MODE_SXGA ? 1024 >> 3 : 480 >> 3)})
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user