The patch number 8512 was added via Jean-Francois Moine <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Jean-Francois Moine <[EMAIL PROTECTED]>
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: Jean-Francois Moine <[EMAIL PROTECTED]>
---
linux/drivers/media/video/gspca/conex.c | 1 -
linux/drivers/media/video/gspca/etoms.c | 1 -
linux/drivers/media/video/gspca/mars.c | 1 -
linux/drivers/media/video/gspca/ov519.c | 1 -
linux/drivers/media/video/gspca/pac7311.c | 1 -
linux/drivers/media/video/gspca/sonixj.c | 1 -
linux/drivers/media/video/gspca/spca500.c | 1 -
linux/drivers/media/video/gspca/spca501.c | 1 -
linux/drivers/media/video/gspca/spca505.c | 1 -
linux/drivers/media/video/gspca/spca506.c | 1 -
linux/drivers/media/video/gspca/spca508.c | 1 -
linux/drivers/media/video/gspca/stk014.c | 1 -
linux/drivers/media/video/gspca/sunplus.c | 1 -
linux/drivers/media/video/gspca/t613.c | 1 -
linux/drivers/media/video/gspca/tv8532.c | 1 -
linux/drivers/media/video/gspca/vc032x.c | 1 -
linux/drivers/media/video/gspca/zc3xx.c | 1 -
17 files changed, 17 deletions(-)
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/conex.c
--- a/linux/drivers/media/video/gspca/conex.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/conex.c Wed Jul 23 08:39:42 2008 +0200
@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *g
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];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/etoms.c
--- a/linux/drivers/media/video/gspca/etoms.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/etoms.c Wed Jul 23 08:39:42 2008 +0200
@@ -617,7 +617,6 @@ static int sd_config(struct gspca_dev *g
/* 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;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/mars.c
--- a/linux/drivers/media/video/gspca/mars.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/mars.c Wed Jul 23 08:39:42 2008 +0200
@@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *g
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];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/ov519.c
--- a/linux/drivers/media/video/gspca/ov519.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/ov519.c Wed Jul 23 08:39:42 2008 +0200
@@ -1372,7 +1372,6 @@ static int sd_config(struct gspca_dev *g
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;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/pac7311.c
--- a/linux/drivers/media/video/gspca/pac7311.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/pac7311.c Wed Jul 23 08:39:42 2008 +0200
@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *g
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);
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/sonixj.c
--- a/linux/drivers/media/video/gspca/sonixj.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/sonixj.c Wed Jul 23 08:39:42 2008 +0200
@@ -987,7 +987,6 @@ static int sd_config(struct gspca_dev *g
}
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
cam->cam_mode = vga_mode;
cam->nmodes = ARRAY_SIZE(vga_mode);
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/spca500.c
--- a/linux/drivers/media/video/gspca/spca500.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca500.c Wed Jul 23 08:39:42 2008 +0200
@@ -745,7 +745,6 @@ static int sd_config(struct gspca_dev *g
break;
}
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
if (sd->subtype != LogitechClickSmart310) {
cam->cam_mode = vga_mode;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/spca501.c
--- a/linux/drivers/media/video/gspca/spca501.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca501.c Wed Jul 23 08:39:42 2008 +0200
@@ -1984,7 +1984,6 @@ static int sd_config(struct gspca_dev *g
break;
}
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];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/spca505.c
--- a/linux/drivers/media/video/gspca/spca505.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca505.c Wed Jul 23 08:39:42 2008 +0200
@@ -731,7 +731,6 @@ static int sd_config(struct gspca_dev *g
}
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
cam->cam_mode = vga_mode;
if (sd->subtype != IntelPCCameraPro)
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/spca506.c
--- a/linux/drivers/media/video/gspca/spca506.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca506.c Wed Jul 23 08:39:42 2008 +0200
@@ -307,7 +307,6 @@ static int sd_config(struct gspca_dev *g
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];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/spca508.c
--- a/linux/drivers/media/video/gspca/spca508.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca508.c Wed Jul 23 08:39:42 2008 +0200
@@ -1579,7 +1579,6 @@ static int sd_config(struct gspca_dev *g
PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1);
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
cam->cam_mode = sif_mode;
cam->nmodes = ARRAY_SIZE(sif_mode);
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/stk014.c
--- a/linux/drivers/media/video/gspca/stk014.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/stk014.c Wed Jul 23 08:39:42 2008 +0200
@@ -296,7 +296,6 @@ static int sd_config(struct gspca_dev *g
struct sd *sd = (struct sd *) gspca_dev;
struct cam *cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x02;
gspca_dev->cam.cam_mode = vga_mode;
gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/sunplus.c
--- a/linux/drivers/media/video/gspca/sunplus.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/sunplus.c Wed Jul 23 08:39:42 2008 +0200
@@ -1052,7 +1052,6 @@ static int sd_config(struct gspca_dev *g
}
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
switch (sd->bridge) {
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/t613.c
--- a/linux/drivers/media/video/gspca/t613.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/t613.c Wed Jul 23 08:39:42 2008 +0200
@@ -435,7 +435,6 @@ static int sd_config(struct gspca_dev *g
#endif
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
cam->cam_mode = vga_mode_t16;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/tv8532.c
--- a/linux/drivers/media/video/gspca/tv8532.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/tv8532.c Wed Jul 23 08:39:42 2008 +0200
@@ -246,7 +246,6 @@ static int sd_config(struct gspca_dev *g
tv_8532WriteEEprom(gspca_dev);
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 1;
cam->cam_mode = sif_mode;
cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/vc032x.c
--- a/linux/drivers/media/video/gspca/vc032x.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/vc032x.c Wed Jul 23 08:39:42 2008 +0200
@@ -1618,7 +1618,6 @@ static int sd_config(struct gspca_dev *g
}
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x02;
if (sd->bridge == BRIDGE_VC0321) {
cam->cam_mode = vc0321_mode;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/zc3xx.c
--- a/linux/drivers/media/video/gspca/zc3xx.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/zc3xx.c Wed Jul 23 08:39:42 2008 +0200
@@ -7158,7 +7158,6 @@ static int sd_config(struct gspca_dev *g
}
cam = &gspca_dev->cam;
- cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01;
/*fixme:test*/
gspca_dev->nbalt--;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/ebd7bf0512fe672da3fa9c33606949f48dd43178
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
