From b85c5b4a6559eafcf3ad4253b97ae6cb1428ab97 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Wed, 23 Jul 2008 08:39:42 +0200 Subject: gspca: Do not use the driver_info field of usb_device_id. From: Jean-Francois Moine The field driver_info will be used to handle the specific per webcam information. Signed-off-by: Jean-Francois Moine --- linux/drivers/media/video/gspca/mars.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/drivers/media/video/gspca/mars.c') diff --git a/linux/drivers/media/video/gspca/mars.c b/linux/drivers/media/video/gspca/mars.c index a4706162f..2d47876bf 100644 --- a/linux/drivers/media/video/gspca/mars.c +++ b/linux/drivers/media/video/gspca/mars.c @@ -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]; -- cgit v1.2.3 From 838a44104a792f93926bbf9f69e90b6f84c1ddb3 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Fri, 25 Jul 2008 13:53:03 +0200 Subject: gspca: Set the specific per webcam information in driver_info. From: Jean-Francois Moine This patch removes a big part of the code run at probe time. Signed-off-by: Jean-Francois Moine --- linux/drivers/media/video/gspca/mars.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux/drivers/media/video/gspca/mars.c') diff --git a/linux/drivers/media/video/gspca/mars.c b/linux/drivers/media/video/gspca/mars.c index 2d47876bf..21c4ee56a 100644 --- a/linux/drivers/media/video/gspca/mars.c +++ b/linux/drivers/media/video/gspca/mars.c @@ -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); -- cgit v1.2.3