Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 513521ea authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6d6a48e5

drivers/media/video/cx18/cx18-controls.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int cx18_try_ctrl(struct file *file, void *fh, 
					struct v4l2_ext_control *vctrl)

{

	struct v4l2_queryctrl qctrl;

	const char **menu_items = NULL;

	const char * const *menu_items = NULL;

	int err;



	qctrl.id = vctrl->id;

drivers/media/video/cx2341x.c

+4 −4
Original line number Diff line number Diff line
@@ -853,9 +853,9 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
}

EXPORT_SYMBOL(cx2341x_ctrl_query);



const char **cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id)

const char * const *cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id)

{

	static const char *mpeg_stream_type_without_ts[] = {

	static const char * const mpeg_stream_type_without_ts[] = {

		"MPEG-2 Program Stream",

		"",

		"MPEG-1 System Stream",
@@ -952,7 +952,7 @@ int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy, 
	for (i = 0; i < ctrls->count; i++) {

		struct v4l2_ext_control *ctrl = ctrls->controls + i;

		struct v4l2_queryctrl qctrl;

		const char **menu_items = NULL;

		const char * const *menu_items = NULL;



		qctrl.id = ctrl->id;

		err = cx2341x_ctrl_query(params, &qctrl);
@@ -1135,7 +1135,7 @@ EXPORT_SYMBOL(cx2341x_update); 


static const char *cx2341x_menu_item(const struct cx2341x_mpeg_params *p, u32 id)

{

	const char **menu = cx2341x_ctrl_get_menu(p, id);

	const char * const *menu = cx2341x_ctrl_get_menu(p, id);

	struct v4l2_ext_control ctrl;



	if (menu == NULL)

drivers/media/video/pvrusb2/pvrusb2-ctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -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)) {

drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/media/video/v4l2-common.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ EXPORT_SYMBOL(v4l2_prio_check); 
   struct v4l2_queryctrl and the available menu items. Note that

   menu_items may be NULL, in that case it is ignored. */

int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,

		const char **menu_items)

		const char * const *menu_items)

{

	if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)

		return -EINVAL;
@@ -199,7 +199,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_fill); 
   If menu_items is NULL, then the menu items are retrieved using

   v4l2_ctrl_get_menu. */

int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl,

	       const char **menu_items)

	       const char * const *menu_items)

{

	int i;
@@ -222,7 +222,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu); 
   Use this if there are 'holes' in the list of valid menu items. */

int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids)

{

	const char **menu_items = v4l2_ctrl_get_menu(qmenu->id);

	const char * const *menu_items = v4l2_ctrl_get_menu(qmenu->id);



	qmenu->reserved = 0;

	if (menu_items == NULL || ids == NULL)