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

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

V4L/DVB (8513): gspca: Set the specific per webcam information in driver_info. 



This patch removes a big part of the code run at probe time.

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

drivers/media/video/gspca/conex.c

+1 −2
Original line number Diff line number Diff line
@@ -1007,9 +1007,8 @@ static struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

#define DVNM(name) .driver_info = (kernel_ulong_t) name

static __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x0572, 0x0041), DVNM("Creative Notebook cx11646")},

	{USB_DEVICE(0x0572, 0x0041)},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);

drivers/media/video/gspca/etoms.c

+4 −20
Original line number Diff line number Diff line
@@ -599,25 +599,10 @@ static int sd_config(struct gspca_dev *gspca_dev, 
{

	struct sd *sd = (struct sd *) gspca_dev;

	struct cam *cam;

	__u16 vendor;

	__u16 product;



	vendor = id->idVendor;

	product = id->idProduct;

/*	switch (vendor) { */

/*	case 0x102c:		* Etoms */

		switch (product) {

		case 0x6151:

			sd->sensor = SENSOR_PAS106;	/* Etoms61x151 */

			break;

		case 0x6251:

			sd->sensor = SENSOR_TAS5130CXX;	/* Etoms61x251 */

			break;

/*		} */

/*		break; */

	}



	cam = &gspca_dev->cam;

	cam->epaddr = 1;

	sd->sensor = id->driver_info;

	if (sd->sensor == SENSOR_PAS106) {

		cam->cam_mode = sif_mode;

		cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
@@ -907,12 +892,11 @@ static struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

#define DVNM(name) .driver_info = (kernel_ulong_t) name

static __devinitdata struct usb_device_id device_table[] = {

#ifndef CONFIG_USB_ET61X251

	{USB_DEVICE(0x102c, 0x6151), DVNM("Qcam Sangha CIF")},

	{USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},

#endif

	{USB_DEVICE(0x102c, 0x6251), DVNM("Qcam xxxxxx VGA")},

	{USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},

	{}

};

drivers/media/video/gspca/mars.c

+1 −2
Original line number Diff line number Diff line
@@ -420,9 +420,8 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

#define DVNM(name) .driver_info = (kernel_ulong_t) name

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x093a, 0x050f), DVNM("Mars-Semi Pc-Camera")},

	{USB_DEVICE(0x093a, 0x050f)},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);

drivers/media/video/gspca/ov519.c

+13 −14
Original line number Diff line number Diff line
@@ -2125,21 +2125,20 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

#define DVNM(name) .driver_info = (kernel_ulong_t) name

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x041e, 0x4052), DVNM("Creative Live! VISTA IM")},

	{USB_DEVICE(0x041e, 0x405f), DVNM("Creative Live! VISTA VF0330")},

	{USB_DEVICE(0x041e, 0x4060), DVNM("Creative Live! VISTA VF0350")},

	{USB_DEVICE(0x041e, 0x4061), DVNM("Creative Live! VISTA VF0400")},

	{USB_DEVICE(0x041e, 0x4064), DVNM("Creative Live! VISTA VF0420")},

	{USB_DEVICE(0x041e, 0x4068), DVNM("Creative Live! VISTA VF0470")},

	{USB_DEVICE(0x045e, 0x028c), DVNM("Microsoft xbox cam")},

	{USB_DEVICE(0x054c, 0x0154), DVNM("Sonny toy4")},

	{USB_DEVICE(0x054c, 0x0155), DVNM("Sonny toy5")},

	{USB_DEVICE(0x05a9, 0x0519), DVNM("OmniVision")},

	{USB_DEVICE(0x05a9, 0x0530), DVNM("OmniVision")},

	{USB_DEVICE(0x05a9, 0x4519), DVNM("OmniVision")},

	{USB_DEVICE(0x05a9, 0x8519), DVNM("OmniVision")},

	{USB_DEVICE(0x041e, 0x4052)},

	{USB_DEVICE(0x041e, 0x405f)},

	{USB_DEVICE(0x041e, 0x4060)},

	{USB_DEVICE(0x041e, 0x4061)},

	{USB_DEVICE(0x041e, 0x4064)},

	{USB_DEVICE(0x041e, 0x4068)},

	{USB_DEVICE(0x045e, 0x028c)},

	{USB_DEVICE(0x054c, 0x0154)},

	{USB_DEVICE(0x054c, 0x0155)},

	{USB_DEVICE(0x05a9, 0x0519)},

	{USB_DEVICE(0x05a9, 0x0530)},

	{USB_DEVICE(0x05a9, 0x4519)},

	{USB_DEVICE(0x05a9, 0x8519)},

	{}

};

#undef DVNAME

drivers/media/video/gspca/pac207.c

+9 −10
Original line number Diff line number Diff line
@@ -570,17 +570,16 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

#define DVNM(name) .driver_info = (kernel_ulong_t) name

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x041e, 0x4028), DVNM("Creative Webcam Vista Plus")},

	{USB_DEVICE(0x093a, 0x2460), DVNM("Q-Tec Webcam 100")},

	{USB_DEVICE(0x093a, 0x2463), DVNM("Philips spc200nc pac207")},

	{USB_DEVICE(0x093a, 0x2464), DVNM("Labtec Webcam 1200")},

	{USB_DEVICE(0x093a, 0x2468), DVNM("PAC207")},

	{USB_DEVICE(0x093a, 0x2470), DVNM("Genius GF112")},

	{USB_DEVICE(0x093a, 0x2471), DVNM("Genius VideoCam GE111")},

	{USB_DEVICE(0x093a, 0x2472), DVNM("Genius VideoCam GE110")},

	{USB_DEVICE(0x2001, 0xf115), DVNM("D-Link DSB-C120")},

	{USB_DEVICE(0x041e, 0x4028)},

	{USB_DEVICE(0x093a, 0x2460)},

	{USB_DEVICE(0x093a, 0x2463)},

	{USB_DEVICE(0x093a, 0x2464)},

	{USB_DEVICE(0x093a, 0x2468)},

	{USB_DEVICE(0x093a, 0x2470)},

	{USB_DEVICE(0x093a, 0x2471)},

	{USB_DEVICE(0x093a, 0x2472)},

	{USB_DEVICE(0x2001, 0xf115)},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);