aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-23 02:39:42 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 10:06:33 -0400
commit07767ebda385956bd2b193f9820de719475bfe6e (patch)
treeeaf521c123c0c410f5ce9d5558b8566a24eadc4e /drivers/media/video
parentc6edaf1674d3c17770b1c9966306b802adb21a2b (diff)
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: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/gspca/conex.c1
-rw-r--r--drivers/media/video/gspca/etoms.c1
-rw-r--r--drivers/media/video/gspca/mars.c1
-rw-r--r--drivers/media/video/gspca/ov519.c1
-rw-r--r--drivers/media/video/gspca/pac7311.c1
-rw-r--r--drivers/media/video/gspca/sonixj.c1
-rw-r--r--drivers/media/video/gspca/spca500.c1
-rw-r--r--drivers/media/video/gspca/spca501.c1
-rw-r--r--drivers/media/video/gspca/spca505.c1
-rw-r--r--drivers/media/video/gspca/spca506.c1
-rw-r--r--drivers/media/video/gspca/spca508.c1
-rw-r--r--drivers/media/video/gspca/stk014.c1
-rw-r--r--drivers/media/video/gspca/sunplus.c1
-rw-r--r--drivers/media/video/gspca/t613.c1
-rw-r--r--drivers/media/video/gspca/tv8532.c1
-rw-r--r--drivers/media/video/gspca/vc032x.c1
-rw-r--r--drivers/media/video/gspca/zc3xx.c1
17 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 18c1dec2f769..f5ef7599d3ca 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
815 struct cam *cam; 815 struct cam *cam;
816 816
817 cam = &gspca_dev->cam; 817 cam = &gspca_dev->cam;
818 cam->dev_name = (char *) id->driver_info;
819 cam->epaddr = 0x01; 818 cam->epaddr = 0x01;
820 cam->cam_mode = vga_mode; 819 cam->cam_mode = vga_mode;
821 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; 820 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 6f2f1d24b7eb..7529bb0bf6fc 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -617,7 +617,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
617/* break; */ 617/* break; */
618 } 618 }
619 cam = &gspca_dev->cam; 619 cam = &gspca_dev->cam;
620 cam->dev_name = (char *) id->driver_info;
621 cam->epaddr = 1; 620 cam->epaddr = 1;
622 if (sd->sensor == SENSOR_PAS106) { 621 if (sd->sensor == SENSOR_PAS106) {
623 cam->cam_mode = sif_mode; 622 cam->cam_mode = sif_mode;
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index a4706162f415..2d47876bfec9 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
137 struct cam *cam; 137 struct cam *cam;
138 138
139 cam = &gspca_dev->cam; 139 cam = &gspca_dev->cam;
140 cam->dev_name = (char *) id->driver_info;
141 cam->epaddr = 0x01; 140 cam->epaddr = 0x01;
142 cam->cam_mode = vga_mode; 141 cam->cam_mode = vga_mode;
143 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; 142 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index f15bec7080c9..9109cbbb6fc1 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -1372,7 +1372,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
1372 cam->cam_mode = sif_mode; 1372 cam->cam_mode = sif_mode;
1373 cam->nmodes = sizeof sif_mode / sizeof sif_mode[0]; 1373 cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
1374 } 1374 }
1375 cam->dev_name = (char *) id->driver_info;
1376 sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value; 1375 sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
1377 sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value; 1376 sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
1378 sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value; 1377 sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 2267ae7cb87f..ad802a72cf04 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
263 reg_w(gspca_dev, 0x3e, 0x20); 263 reg_w(gspca_dev, 0x3e, 0x20);
264 264
265 cam = &gspca_dev->cam; 265 cam = &gspca_dev->cam;
266 cam->dev_name = (char *) id->driver_info;
267 cam->epaddr = 0x05; 266 cam->epaddr = 0x05;
268 cam->cam_mode = vga_mode; 267 cam->cam_mode = vga_mode;
269 cam->nmodes = ARRAY_SIZE(vga_mode); 268 cam->nmodes = ARRAY_SIZE(vga_mode);
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 35b1a3ee4c3f..3f8418c7e5fd 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -976,7 +976,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
976 } 976 }
977 977
978 cam = &gspca_dev->cam; 978 cam = &gspca_dev->cam;
979 cam->dev_name = (char *) id->driver_info;
980 cam->epaddr = 0x01; 979 cam->epaddr = 0x01;
981 cam->cam_mode = vga_mode; 980 cam->cam_mode = vga_mode;
982 cam->nmodes = ARRAY_SIZE(vga_mode); 981 cam->nmodes = ARRAY_SIZE(vga_mode);
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 8c83823745f0..2b8ae8095b0e 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -728,7 +728,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
728 break; 728 break;
729 } 729 }
730 cam = &gspca_dev->cam; 730 cam = &gspca_dev->cam;
731 cam->dev_name = (char *) id->driver_info;
732 cam->epaddr = 0x01; 731 cam->epaddr = 0x01;
733 if (sd->subtype != LogitechClickSmart310) { 732 if (sd->subtype != LogitechClickSmart310) {
734 cam->cam_mode = vga_mode; 733 cam->cam_mode = vga_mode;
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 6537acee89dd..a695c42e10cf 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1973,7 +1973,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
1973 break; 1973 break;
1974 } 1974 }
1975 cam = &gspca_dev->cam; 1975 cam = &gspca_dev->cam;
1976 cam->dev_name = (char *) id->driver_info;
1977 cam->epaddr = 0x01; 1976 cam->epaddr = 0x01;
1978 cam->cam_mode = vga_mode; 1977 cam->cam_mode = vga_mode;
1979 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; 1978 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index 1bb23d03f048..adff24f503bb 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -662,7 +662,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
662 } 662 }
663 663
664 cam = &gspca_dev->cam; 664 cam = &gspca_dev->cam;
665 cam->dev_name = (char *) id->driver_info;
666 cam->epaddr = 0x01; 665 cam->epaddr = 0x01;
667 cam->cam_mode = vga_mode; 666 cam->cam_mode = vga_mode;
668 if (sd->subtype != IntelPCCameraPro) 667 if (sd->subtype != IntelPCCameraPro)
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 40e8541b2b89..36dc13c11cbb 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -307,7 +307,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
307 struct cam *cam; 307 struct cam *cam;
308 308
309 cam = &gspca_dev->cam; 309 cam = &gspca_dev->cam;
310 cam->dev_name = (char *) id->driver_info;
311 cam->epaddr = 0x01; 310 cam->epaddr = 0x01;
312 cam->cam_mode = vga_mode; 311 cam->cam_mode = vga_mode;
313 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; 312 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 362f645d08c6..eff5eda70e68 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1541,7 +1541,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
1541 PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1); 1541 PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1);
1542 1542
1543 cam = &gspca_dev->cam; 1543 cam = &gspca_dev->cam;
1544 cam->dev_name = (char *) id->driver_info;
1545 cam->epaddr = 0x01; 1544 cam->epaddr = 0x01;
1546 cam->cam_mode = sif_mode; 1545 cam->cam_mode = sif_mode;
1547 cam->nmodes = ARRAY_SIZE(sif_mode); 1546 cam->nmodes = ARRAY_SIZE(sif_mode);
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 90efde17b08b..f6390b49f693 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -296,7 +296,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
296 struct sd *sd = (struct sd *) gspca_dev; 296 struct sd *sd = (struct sd *) gspca_dev;
297 struct cam *cam = &gspca_dev->cam; 297 struct cam *cam = &gspca_dev->cam;
298 298
299 cam->dev_name = (char *) id->driver_info;
300 cam->epaddr = 0x02; 299 cam->epaddr = 0x02;
301 gspca_dev->cam.cam_mode = vga_mode; 300 gspca_dev->cam.cam_mode = vga_mode;
302 gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); 301 gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 53e20275f26d..030cb18b3557 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1021,7 +1021,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
1021 } 1021 }
1022 1022
1023 cam = &gspca_dev->cam; 1023 cam = &gspca_dev->cam;
1024 cam->dev_name = (char *) id->driver_info;
1025 cam->epaddr = 0x01; 1024 cam->epaddr = 0x01;
1026 1025
1027 switch (sd->bridge) { 1026 switch (sd->bridge) {
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index fc1c62e5a2fd..f7ea9a742725 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -422,7 +422,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
422 struct cam *cam; 422 struct cam *cam;
423 423
424 cam = &gspca_dev->cam; 424 cam = &gspca_dev->cam;
425 cam->dev_name = (char *) id->driver_info;
426 cam->epaddr = 0x01; 425 cam->epaddr = 0x01;
427 426
428 cam->cam_mode = vga_mode_t16; 427 cam->cam_mode = vga_mode_t16;
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index cb2d9da2a224..b024aca9b102 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -246,7 +246,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
246 tv_8532WriteEEprom(gspca_dev); 246 tv_8532WriteEEprom(gspca_dev);
247 247
248 cam = &gspca_dev->cam; 248 cam = &gspca_dev->cam;
249 cam->dev_name = (char *) id->driver_info;
250 cam->epaddr = 1; 249 cam->epaddr = 1;
251 cam->cam_mode = sif_mode; 250 cam->cam_mode = sif_mode;
252 cam->nmodes = sizeof sif_mode / sizeof sif_mode[0]; 251 cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index e306ac420298..46cff48e6297 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -1438,7 +1438,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
1438 } 1438 }
1439 1439
1440 cam = &gspca_dev->cam; 1440 cam = &gspca_dev->cam;
1441 cam->dev_name = (char *) id->driver_info;
1442 cam->epaddr = 0x02; 1441 cam->epaddr = 0x02;
1443 if (sd->bridge == BRIDGE_VC0321) { 1442 if (sd->bridge == BRIDGE_VC0321) {
1444 cam->cam_mode = vc0321_mode; 1443 cam->cam_mode = vc0321_mode;
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index f8d6f1780a45..acd538da0784 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7153,7 +7153,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
7153 } 7153 }
7154 7154
7155 cam = &gspca_dev->cam; 7155 cam = &gspca_dev->cam;
7156 cam->dev_name = (char *) id->driver_info;
7157 cam->epaddr = 0x01; 7156 cam->epaddr = 0x01;
7158/*fixme:test*/ 7157/*fixme:test*/
7159 gspca_dev->nbalt--; 7158 gspca_dev->nbalt--;
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 01:00:20 -0500