Skip to content

Commit

Permalink
V4L/DVB (13898): gspca - some subdrivers: Make sd_desc const.
Browse files Browse the repository at this point in the history
The function callbacks in sd_desc are defined at compile time and
they do not change at runtime. Make the sd_desc initializations const.

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Márton Németh authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 52a9d3e commit aabcdfb
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/conex.c
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
}

/* sub-driver description */
static struct sd_desc sd_desc = {
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/etoms.c
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
}

/* sub-driver description */
static struct sd_desc sd_desc = {
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
Expand Down
10 changes: 5 additions & 5 deletions drivers/media/video/gspca/gl860/gl860.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int gl860_build_control_table(struct gspca_dev *gspca_dev)

/*==================== sud-driver structure initialisation =================*/

static struct sd_desc sd_desc_mi1320 = {
static const struct sd_desc sd_desc_mi1320 = {
.name = MODULE_NAME,
.ctrls = sd_ctrls_mi1320,
.nctrls = GL860_NCTRLS,
Expand All @@ -174,7 +174,7 @@ static struct sd_desc sd_desc_mi1320 = {
.dq_callback = sd_callback,
};

static struct sd_desc sd_desc_mi2020 = {
static const struct sd_desc sd_desc_mi2020 = {
.name = MODULE_NAME,
.ctrls = sd_ctrls_mi2020,
.nctrls = GL860_NCTRLS,
Expand All @@ -187,7 +187,7 @@ static struct sd_desc sd_desc_mi2020 = {
.dq_callback = sd_callback,
};

static struct sd_desc sd_desc_mi2020b = {
static const struct sd_desc sd_desc_mi2020b = {
.name = MODULE_NAME,
.ctrls = sd_ctrls_mi2020b,
.nctrls = GL860_NCTRLS,
Expand All @@ -200,7 +200,7 @@ static struct sd_desc sd_desc_mi2020b = {
.dq_callback = sd_callback,
};

static struct sd_desc sd_desc_ov2640 = {
static const struct sd_desc sd_desc_ov2640 = {
.name = MODULE_NAME,
.ctrls = sd_ctrls_ov2640,
.nctrls = GL860_NCTRLS,
Expand All @@ -213,7 +213,7 @@ static struct sd_desc sd_desc_ov2640 = {
.dq_callback = sd_callback,
};

static struct sd_desc sd_desc_ov9655 = {
static const struct sd_desc sd_desc_ov9655 = {
.name = MODULE_NAME,
.ctrls = sd_ctrls_ov9655,
.nctrls = GL860_NCTRLS,
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/pac7302.c
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ static int sd_chip_ident(struct gspca_dev *gspca_dev,
#endif

/* sub-driver description for pac7302 */
static struct sd_desc sd_desc = {
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/pac7311.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
}

/* sub-driver description for pac7311 */
static struct sd_desc sd_desc = {
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/spca500.c
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
}

/* sub-driver description */
static struct sd_desc sd_desc = {
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/spca506.c
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val)
}

/* sub-driver description */
static struct sd_desc sd_desc = {
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
Expand Down

0 comments on commit aabcdfb

Please sign in to comment.