From: Hans de Goede Date: Wed, 9 May 2012 14:22:47 +0000 (-0300) Subject: [media] gscpa_stv06xx: Make sd_desc const X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d67a1adaea29da942291145fa3964a453e017274;p=linux-beck.git [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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c index 3a8d034421fc..cebd615effeb 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 b338edcdbe0c..b7cbc6b878d3 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;