diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-05-09 11:22:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 09:38:26 -0300 |
| commit | d67a1adaea29da942291145fa3964a453e017274 (patch) | |
| tree | 9e1e785f59856838b28bf7558bbb6b7c35bebe35 | |
| parent | dec9c51442b5a524c137b6f4a54ec109a197a65a (diff) | |
| download | op-kernel-dev-d67a1adaea29da942291145fa3964a453e017274.zip op-kernel-dev-d67a1adaea29da942291145fa3964a453e017274.tar.gz | |
[media] gscpa_stv06xx: Make sd_desc const
Now that stv06xx is using the control framework it is no longer necessary
to have a (non const) copy of sd_desc inside the sd specific data struct.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c index 3a8d034..cebd615 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.c +++ b/drivers/media/video/gspca/stv06xx/stv06xx.c @@ -542,9 +542,8 @@ static int stv06xx_config(struct gspca_dev *gspca_dev, PDEBUG(D_PROBE, "Configuring camera"); - sd->desc = sd_desc; sd->bridge = id->driver_info; - gspca_dev->sd_desc = &sd->desc; + gspca_dev->sd_desc = &sd_desc; if (dump_bridge) stv06xx_dump_bridge(sd); diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.h b/drivers/media/video/gspca/stv06xx/stv06xx.h index b338edc..b7cbc6b 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.h +++ b/drivers/media/video/gspca/stv06xx/stv06xx.h @@ -92,9 +92,6 @@ struct sd { /* Control handler */ struct v4l2_ctrl_handler ctrl_handler; - /* A pointer to the sd_desc struct */ - struct sd_desc desc; - /* Sensor private data */ void *sensor_priv; |
