Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l2-ctrls: add __v4l2_ctrl_s_ctrl_compound()

Browse Source 
Rather than creating new compound control helpers for each new
type, create one generic function and just create defines on
top.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Hans Verkuil 2020-03-03 12:02:00 +01:00 committed by Mauro Carvalho Chehab
parent 7c3bae3f43
commit b2b1046f1d
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/v4l2-core/v4l2-ctrls.c
View File

@ -4253,18 +4253,18 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s)
}
EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_string);
int __v4l2_ctrl_s_ctrl_area(struct v4l2_ctrl *ctrl,
const struct v4l2_area *area)
int __v4l2_ctrl_s_ctrl_compound(struct v4l2_ctrl *ctrl,
enum v4l2_ctrl_type type, const void *p)
{
lockdep_assert_held(ctrl->handler->lock);
/* It's a driver bug if this happens. */
if (WARN_ON(ctrl->type != V4L2_CTRL_TYPE_AREA))
if (WARN_ON(ctrl->type != type))
return -EINVAL;
*ctrl->p_new.p_area = *area;
memcpy(ctrl->p_new.p, p, ctrl->elems * ctrl->elem_size);
return set_ctrl(NULL, ctrl, 0);
}
EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_area);
EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_compound);
void v4l2_ctrl_request_complete(struct media_request *req,
struct v4l2_ctrl_handler *main_hdl)

49
include/media/v4l2-ctrls.h
View File

@ -1113,45 +1113,54 @@ static inline int v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s)
}
/**
* __v4l2_ctrl_s_ctrl_area() - Unlocked variant of v4l2_ctrl_s_ctrl_area().
* __v4l2_ctrl_s_ctrl_compound() - Unlocked variant to set a compound control
*
* @ctrl: The control.
* @area: The new area.
* @ctrl: The control.
* @type: The type of the data.
* @p: The new compound payload.
*
* This sets the control's new area safely by going through the control
* framework. This function assumes the control's handler is already locked,
* allowing it to be used from within the &v4l2_ctrl_ops functions.
* This sets the control's new compound payload safely by going through the
* control framework. This function assumes the control's handler is already
* locked, allowing it to be used from within the &v4l2_ctrl_ops functions.
*
* This function is for area type controls only.
* This function is for compound type controls only.
*/
int __v4l2_ctrl_s_ctrl_area(struct v4l2_ctrl *ctrl,
const struct v4l2_area *area);
int __v4l2_ctrl_s_ctrl_compound(struct v4l2_ctrl *ctrl,
enum v4l2_ctrl_type type, const void *p);
/**
* v4l2_ctrl_s_ctrl_area() - Helper function to set a control's area value
* from within a driver.
* v4l2_ctrl_s_ctrl_compound() - Helper function to set a compound control
* from within a driver.
*
* @ctrl: The control.
* @area: The new area.
* @ctrl: The control.
* @type: The type of the data.
* @p: The new compound payload.
*
* This sets the control's new area safely by going through the control
* framework. This function will lock the control's handler, so it cannot be
* used from within the &v4l2_ctrl_ops functions.
* This sets the control's new compound payload safely by going through the
* control framework. This function will lock the control's handler, so it
* cannot be used from within the &v4l2_ctrl_ops functions.
*
* This function is for area type controls only.
* This function is for compound type controls only.
*/
static inline int v4l2_ctrl_s_ctrl_area(struct v4l2_ctrl *ctrl,
const struct v4l2_area *area)
static inline int v4l2_ctrl_s_ctrl_compound(struct v4l2_ctrl *ctrl,
enum v4l2_ctrl_type type,
const void *p)
{
int rval;
v4l2_ctrl_lock(ctrl);
rval = __v4l2_ctrl_s_ctrl_area(ctrl, area);
rval = __v4l2_ctrl_s_ctrl_compound(ctrl, type, p);
v4l2_ctrl_unlock(ctrl);
return rval;
}
/* Helper defines for area type controls */
#define __v4l2_ctrl_s_ctrl_area(ctrl, area) \
__v4l2_ctrl_s_ctrl_compound((ctrl), V4L2_CTRL_TYPE_AREA, (area))
#define v4l2_ctrl_s_ctrl_area(ctrl, area) \
v4l2_ctrl_s_ctrl_compound((ctrl), V4L2_CTRL_TYPE_AREA, (area))
/* Internal helper functions that deal with control events. */
extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops;