Commit 83955556 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

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: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 37b372e5

drivers/media/video/gspca/gl860/gl860-mi1320.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/gspca/gl860/gl860-mi2020.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/gspca/gl860/gl860.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/gspca/gspca.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

		i = ctrls - gspca_dev->sd_desc->ctrls;

	}

		if (ctrls == NULL)

			return -EINVAL;

		i = ctrls - gspca_dev->sd_desc->ctrls;

	}

	memcpy(q_ctrl, ctrls, sizeof *q_ctrl);

	if (gspca_dev->ctrl_inac & (1 << i))

		q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

drivers/media/video/gspca/m5602/m5602_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;