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

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
...@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam; struct cam *cam;
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
......
...@@ -617,7 +617,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -617,7 +617,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
/* break; */ /* break; */
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 1; cam->epaddr = 1;
if (sd->sensor == SENSOR_PAS106) { if (sd->sensor == SENSOR_PAS106) {
cam->cam_mode = sif_mode; cam->cam_mode = sif_mode;
......
...@@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam; struct cam *cam;
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
......
...@@ -1372,7 +1372,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -1372,7 +1372,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
cam->cam_mode = sif_mode; cam->cam_mode = sif_mode;
cam->nmodes = sizeof sif_mode / sizeof sif_mode[0]; 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->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value; sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value; sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
......
...@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
reg_w(gspca_dev, 0x3e, 0x20); reg_w(gspca_dev, 0x3e, 0x20);
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x05; cam->epaddr = 0x05;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = ARRAY_SIZE(vga_mode); cam->nmodes = ARRAY_SIZE(vga_mode);
......
...@@ -976,7 +976,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -976,7 +976,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = ARRAY_SIZE(vga_mode); cam->nmodes = ARRAY_SIZE(vga_mode);
......
...@@ -728,7 +728,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -728,7 +728,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
break; break;
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
if (sd->subtype != LogitechClickSmart310) { if (sd->subtype != LogitechClickSmart310) {
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
......
...@@ -1973,7 +1973,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -1973,7 +1973,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
break; break;
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
......
...@@ -662,7 +662,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -662,7 +662,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
if (sd->subtype != IntelPCCameraPro) if (sd->subtype != IntelPCCameraPro)
......
...@@ -307,7 +307,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -307,7 +307,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam; struct cam *cam;
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode; cam->cam_mode = vga_mode;
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0]; cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
......
...@@ -1541,7 +1541,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -1541,7 +1541,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1); PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1);
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = sif_mode; cam->cam_mode = sif_mode;
cam->nmodes = ARRAY_SIZE(sif_mode); cam->nmodes = ARRAY_SIZE(sif_mode);
......
...@@ -296,7 +296,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -296,7 +296,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
struct cam *cam = &gspca_dev->cam; struct cam *cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x02; cam->epaddr = 0x02;
gspca_dev->cam.cam_mode = vga_mode; gspca_dev->cam.cam_mode = vga_mode;
gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
......
...@@ -1021,7 +1021,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -1021,7 +1021,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
switch (sd->bridge) { switch (sd->bridge) {
......
...@@ -422,7 +422,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -422,7 +422,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam; struct cam *cam;
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
cam->cam_mode = vga_mode_t16; cam->cam_mode = vga_mode_t16;
......
...@@ -246,7 +246,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -246,7 +246,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
tv_8532WriteEEprom(gspca_dev); tv_8532WriteEEprom(gspca_dev);
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 1; cam->epaddr = 1;
cam->cam_mode = sif_mode; cam->cam_mode = sif_mode;
cam->nmodes = sizeof sif_mode / sizeof sif_mode[0]; cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
......
...@@ -1438,7 +1438,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -1438,7 +1438,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x02; cam->epaddr = 0x02;
if (sd->bridge == BRIDGE_VC0321) { if (sd->bridge == BRIDGE_VC0321) {
cam->cam_mode = vc0321_mode; cam->cam_mode = vc0321_mode;
......
...@@ -7153,7 +7153,6 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -7153,7 +7153,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
cam->dev_name = (char *) id->driver_info;
cam->epaddr = 0x01; cam->epaddr = 0x01;
/*fixme:test*/ /*fixme:test*/
gspca_dev->nbalt--; gspca_dev->nbalt--;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment