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

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

[media] v4l2-common: remove unused helper functions 



Several control helper functions are no longer needed since most drivers
are now converted to the control framework. So we can delete them.

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

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

+0 −95
Original line number Original line Diff line number Diff line
@@ -135,101 +135,6 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 _min, s32 _max, s32 _ 
}

}

EXPORT_SYMBOL(v4l2_ctrl_query_fill);

EXPORT_SYMBOL(v4l2_ctrl_query_fill);





/* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and

   the menu. The qctrl pointer may be NULL, in which case it is ignored.

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

{

	int i;



	qmenu->reserved = 0;

	if (menu_items == NULL)

		menu_items = v4l2_ctrl_get_menu(qmenu->id);

	if (menu_items == NULL ||

	    (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum)))

		return -EINVAL;

	for (i = 0; i < qmenu->index && menu_items[i]; i++) ;

	if (menu_items[i] == NULL || menu_items[i][0] == '\0')

		return -EINVAL;

	strlcpy(qmenu->name, menu_items[qmenu->index], sizeof(qmenu->name));

	return 0;

}

EXPORT_SYMBOL(v4l2_ctrl_query_menu);



/* Fill in a struct v4l2_querymenu based on the specified array of valid

   menu items (terminated by V4L2_CTRL_MENU_IDS_END).

   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 * const *menu_items = v4l2_ctrl_get_menu(qmenu->id);



	qmenu->reserved = 0;

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

		return -EINVAL;

	while (*ids != V4L2_CTRL_MENU_IDS_END) {

		if (*ids++ == qmenu->index) {

			strlcpy(qmenu->name, menu_items[qmenu->index],

					sizeof(qmenu->name));

			return 0;

		}

	}

	return -EINVAL;

}

EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);



/* ctrl_classes points to an array of u32 pointers, the last element is

   a NULL pointer. Each u32 array is a 0-terminated array of control IDs.

   Each array must be sorted low to high and belong to the same control

   class. The array of u32 pointers must also be sorted, from low class IDs

   to high class IDs.



   This function returns the first ID that follows after the given ID.

   When no more controls are available 0 is returned. */

u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)

{

	u32 ctrl_class = V4L2_CTRL_ID2CLASS(id);

	const u32 *pctrl;



	if (ctrl_classes == NULL)

		return 0;



	/* if no query is desired, then check if the ID is part of ctrl_classes */

	if ((id & V4L2_CTRL_FLAG_NEXT_CTRL) == 0) {

		/* find class */

		while (*ctrl_classes && V4L2_CTRL_ID2CLASS(**ctrl_classes) != ctrl_class)

			ctrl_classes++;

		if (*ctrl_classes == NULL)

			return 0;

		pctrl = *ctrl_classes;

		/* find control ID */

		while (*pctrl && *pctrl != id) pctrl++;

		return *pctrl ? id : 0;

	}

	id &= V4L2_CTRL_ID_MASK;

	id++;	/* select next control */

	/* find first class that matches (or is greater than) the class of

	   the ID */

	while (*ctrl_classes && V4L2_CTRL_ID2CLASS(**ctrl_classes) < ctrl_class)

		ctrl_classes++;

	/* no more classes */

	if (*ctrl_classes == NULL)

		return 0;

	pctrl = *ctrl_classes;

	/* find first ctrl within the class that is >= ID */

	while (*pctrl && *pctrl < id) pctrl++;

	if (*pctrl)

		return *pctrl;

	/* we are at the end of the controls of the current class. */

	/* continue with next class if available */

	ctrl_classes++;

	if (*ctrl_classes == NULL)

		return 0;

	return **ctrl_classes;

}

EXPORT_SYMBOL(v4l2_ctrl_next);



/* I2C Helper functions */

/* I2C Helper functions */





#if IS_ENABLED(CONFIG_I2C)

#if IS_ENABLED(CONFIG_I2C)

include/media/v4l2-common.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -88,16 +88,6 @@ const char *v4l2_ctrl_get_name(u32 id); 
const char * const *v4l2_ctrl_get_menu(u32 id);

const char * const *v4l2_ctrl_get_menu(u32 id);

const s64 *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_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);

#define V4L2_CTRL_MENU_IDS_END (0xffffffff)

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



/* Note: ctrl_classes points to an array of u32 pointers. Each u32 array is a

   0-terminated array of control IDs. Each array must be sorted low to high

   and belong to the same control class. The array of u32 pointers must also

   be sorted, from low class IDs to high class IDs. */

u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);





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

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