aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx2341x.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-29 12:25:52 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-30 05:02:14 -0500
commit513521eaee4375a1a0da0b73c7131a165a9fe4d9 (patch)
tree352f8d9053c1dd6d6866f13feed818bb24934f4a /drivers/media/video/cx2341x.c
parent6d6a48e51fd3bcb40c5b88d0f9690ba960eedfd2 (diff)
[media] v4l2-ctrls: use const char * const * for the menu arrays
This prevents checkpatch warnings generated when defining 'static const char *foo[]' arrays. It makes sense to use const char * const * anyway since the pointers in the array are indeed const. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx2341x.c')
-rw-r--r--drivers/media/video/cx2341x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index e5c3c8da4be3..103ef6bad2e2 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -853,9 +853,9 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params,
853} 853}
854EXPORT_SYMBOL(cx2341x_ctrl_query); 854EXPORT_SYMBOL(cx2341x_ctrl_query);
855 855
856const char **cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id) 856const char * const *cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id)
857{ 857{
858 static const char *mpeg_stream_type_without_ts[] = { 858 static const char * const mpeg_stream_type_without_ts[] = {
859 "MPEG-2 Program Stream", 859 "MPEG-2 Program Stream",
860 "", 860 "",
861 "MPEG-1 System Stream", 861 "MPEG-1 System Stream",
@@ -952,7 +952,7 @@ int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy,
952 for (i = 0; i < ctrls->count; i++) { 952 for (i = 0; i < ctrls->count; i++) {
953 struct v4l2_ext_control *ctrl = ctrls->controls + i; 953 struct v4l2_ext_control *ctrl = ctrls->controls + i;
954 struct v4l2_queryctrl qctrl; 954 struct v4l2_queryctrl qctrl;
955 const char **menu_items = NULL; 955 const char * const *menu_items = NULL;
956 956
957 qctrl.id = ctrl->id; 957 qctrl.id = ctrl->id;
958 err = cx2341x_ctrl_query(params, &qctrl); 958 err = cx2341x_ctrl_query(params, &qctrl);
@@ -1135,7 +1135,7 @@ EXPORT_SYMBOL(cx2341x_update);
1135 1135
1136static const char *cx2341x_menu_item(const struct cx2341x_mpeg_params *p, u32 id) 1136static const char *cx2341x_menu_item(const struct cx2341x_mpeg_params *p, u32 id)
1137{ 1137{
1138 const char **menu = cx2341x_ctrl_get_menu(p, id); 1138 const char * const *menu = cx2341x_ctrl_get_menu(p, id);
1139 struct v4l2_ext_control ctrl; 1139 struct v4l2_ext_control ctrl;
1140 1140
1141 if (menu == NULL) 1141 if (menu == NULL)