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

Commit 4eed9b33 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-ctrls: Correct v4l2_ctrl_get_int_menu() function's return type 



Remove the redundant 'const' qualifiers from the function
signature and from the qmenu_int arrays' declarations.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b9e9f02a

drivers/media/v4l2-core/v4l2-ctrls.c

+3 −3
Original line number Diff line number Diff line
@@ -565,13 +565,13 @@ EXPORT_SYMBOL(v4l2_ctrl_get_menu); 
 * Returns NULL or an s64 type array containing the menu for given

 * control ID. The total number of the menu items is returned in @len.

 */

const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len)

const s64 *v4l2_ctrl_get_int_menu(u32 id, u32 *len)

{

	static const s64 const qmenu_int_vpx_num_partitions[] = {

	static const s64 qmenu_int_vpx_num_partitions[] = {

		1, 2, 4, 8,

	};



	static const s64 const qmenu_int_vpx_num_ref_frames[] = {

	static const s64 qmenu_int_vpx_num_ref_frames[] = {

		1, 2, 3,

	};

include/media/v4l2-common.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl, 
		const char * const *menu_items);

const char *v4l2_ctrl_get_name(u32 id);

const char * const *v4l2_ctrl_get_menu(u32 id);

const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len);

const s64 *v4l2_ctrl_get_int_menu(u32 id, u32 *len);

int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def);

int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu,

		struct v4l2_queryctrl *qctrl, const char * const *menu_items);