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

Commit 4daee779 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-common: move v4l2_ctrl_check to cx2341x 



The v4l2_ctrl_check() helper function is now only used in cx2341x.
Move it there and make it static.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 79fbc209

drivers/media/common/cx2341x.c

+29 −0
Original line number Diff line number Diff line
@@ -931,6 +931,35 @@ static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params) 
	}

}



/* Check for correctness of the ctrl's value based on the data from

   struct v4l2_queryctrl and the available menu items. Note that

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

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

		const char * const *menu_items)

{

	if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)

		return -EINVAL;

	if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED)

		return -EBUSY;

	if (qctrl->type == V4L2_CTRL_TYPE_STRING)

		return 0;

	if (qctrl->type == V4L2_CTRL_TYPE_BUTTON ||

	    qctrl->type == V4L2_CTRL_TYPE_INTEGER64 ||

	    qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)

		return 0;

	if (ctrl->value < qctrl->minimum || ctrl->value > qctrl->maximum)

		return -ERANGE;

	if (qctrl->type == V4L2_CTRL_TYPE_MENU && menu_items != NULL) {

		if (menu_items[ctrl->value] == NULL ||

		    menu_items[ctrl->value][0] == '\0')

			return -EINVAL;

	}

	if (qctrl->type == V4L2_CTRL_TYPE_BITMASK &&

			(ctrl->value & ~qctrl->maximum))

		return -ERANGE;

	return 0;

}



int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy,

		  struct v4l2_ext_controls *ctrls, unsigned int cmd)

{

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

+0 −30
Original line number Diff line number Diff line
@@ -80,36 +80,6 @@ MODULE_LICENSE("GPL"); 


/* Helper functions for control handling			     */



/* Check for correctness of the ctrl's value based on the data from

   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 * const *menu_items)

{

	if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)

		return -EINVAL;

	if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED)

		return -EBUSY;

	if (qctrl->type == V4L2_CTRL_TYPE_STRING)

		return 0;

	if (qctrl->type == V4L2_CTRL_TYPE_BUTTON ||

	    qctrl->type == V4L2_CTRL_TYPE_INTEGER64 ||

	    qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)

		return 0;

	if (ctrl->value < qctrl->minimum || ctrl->value > qctrl->maximum)

		return -ERANGE;

	if (qctrl->type == V4L2_CTRL_TYPE_MENU && menu_items != NULL) {

		if (menu_items[ctrl->value] == NULL ||

		    menu_items[ctrl->value][0] == '\0')

			return -EINVAL;

	}

	if (qctrl->type == V4L2_CTRL_TYPE_BITMASK &&

			(ctrl->value & ~qctrl->maximum))

		return -ERANGE;

	return 0;

}

EXPORT_SYMBOL(v4l2_ctrl_check);



/* Fill in a struct v4l2_queryctrl */

int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 _min, s32 _max, s32 _step, s32 _def)

{

include/media/v4l2-common.h

+1 −3
Original line number Diff line number Diff line
@@ -80,10 +80,8 @@ 


/* ------------------------------------------------------------------------- */



/* Control helper functions */

/* Control helper function */



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

		const char * const *menu_items);

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



/* ------------------------------------------------------------------------- */