Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

V4L/DVB (8512): gspca: Do not use the driver_info field of usb_device_id. 



The field driver_info will be used to handle the specific per webcam
information.

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c6edaf16

drivers/media/video/gspca/conex.c

+0 −1
Original line number Diff line number Diff line
@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	struct cam *cam;



	cam = &gspca_dev->cam;

	cam->dev_name = (char *) id->driver_info;

	cam->epaddr = 0x01;

	cam->cam_mode = vga_mode;

	cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];

drivers/media/video/gspca/etoms.c

+0 −1
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
/*		break; */

	}

	cam = &gspca_dev->cam;

	cam->dev_name = (char *) id->driver_info;

	cam->epaddr = 1;

	if (sd->sensor == SENSOR_PAS106) {

		cam->cam_mode = sif_mode;

drivers/media/video/gspca/mars.c

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	struct cam *cam;



	cam = &gspca_dev->cam;

	cam->dev_name = (char *) id->driver_info;

	cam->epaddr = 0x01;

	cam->cam_mode = vga_mode;

	cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];

drivers/media/video/gspca/ov519.c

+0 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
		cam->cam_mode = sif_mode;

		cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];

	}

	cam->dev_name = (char *) id->driver_info;

	sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;

	sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;

	sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;

drivers/media/video/gspca/pac7311.c

+0 −1
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	reg_w(gspca_dev, 0x3e, 0x20);



	cam = &gspca_dev->cam;

	cam->dev_name = (char *) id->driver_info;

	cam->epaddr = 0x05;

	cam->cam_mode = vga_mode;

	cam->nmodes = ARRAY_SIZE(vga_mode);