[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>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 55ea914c7fcd..7d5a7139a45a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -203,7 +203,7 @@ int pvr2_ctrl_get_valname(struct pvr2_ctrl *cptr,int val,
         *blen = 0;
         LOCK_TAKE(cptr->hdw->big_lock); do {
                 if (cptr->info->type == pvr2_ctl_enum) {
-                        const char **names;
+                        const char * const *names;
                         names = cptr->info->def.type_enum.value_names;
                         if (pvr2_ctrl_range_check(cptr,val) == 0) {
                                 if (names[val]) {
@@ -367,7 +367,7 @@ static const char *boolNames[] = {
 
 static int parse_token(const char *ptr,unsigned int len,
                        int *valptr,
-                       const char **names,unsigned int namecnt)
+                       const char * const *names, unsigned int namecnt)
 {
         char buf[33];
         unsigned int slen;
@@ -559,7 +559,7 @@ int pvr2_ctrl_value_to_sym_internal(struct pvr2_ctrl *cptr,
                 *len = scnprintf(buf,maxlen,"%s",val ? "true" : "false");
                 ret = 0;
         } else if (cptr->info->type == pvr2_ctl_enum) {
-                const char **names;
+                const char * const *names;
                 names = cptr->info->def.type_enum.value_names;
                 if ((val >= 0) &&
                     (val < cptr->info->def.type_enum.count)) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index cb4057bb07a0..ac94a8bf883e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -115,7 +115,7 @@ struct pvr2_ctl_info {
                 } type_int;
                 struct { /* enumerated control */
                         unsigned int count;       /* enum value count */
-                        const char **value_names; /* symbol names */
+                        const char * const *value_names; /* symbol names */
                 } type_enum;
                 struct { /* bitmask control */
                         unsigned int valid_bits; /* bits in use */