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

Commit 605b3840 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: ctrls: Move control lock/unlock above the control access functions 



The v4l2_ctrl_{,un}lock will be needed elsewhere. Define them before the
functions that perform operations on controls.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent c9adcb73

include/media/v4l2-ctrls.h

+18 −18
Original line number Diff line number Diff line
@@ -367,6 +367,24 @@ int v4l2_ctrl_handler_init_class(struct v4l2_ctrl_handler *hdl, 
  */

void v4l2_ctrl_handler_free(struct v4l2_ctrl_handler *hdl);



/** v4l2_ctrl_lock() - Helper function to lock the handler

  * associated with the control.

  * @ctrl:	The control to lock.

  */

static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)

{

	mutex_lock(ctrl->handler->lock);

}



/** v4l2_ctrl_unlock() - Helper function to unlock the handler

  * associated with the control.

  * @ctrl:	The control to unlock.

  */

static inline void v4l2_ctrl_unlock(struct v4l2_ctrl *ctrl)

{

	mutex_unlock(ctrl->handler->lock);

}



/** v4l2_ctrl_handler_setup() - Call the s_ctrl op for all controls belonging

  * to the handler to initialize the hardware to the current control values.

  * @hdl:	The control handler.
@@ -622,24 +640,6 @@ void v4l2_ctrl_grab(struct v4l2_ctrl *ctrl, bool grabbed); 
int v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,

			s64 min, s64 max, u64 step, s64 def);



/** v4l2_ctrl_lock() - Helper function to lock the handler

  * associated with the control.

  * @ctrl:	The control to lock.

  */

static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)

{

	mutex_lock(ctrl->handler->lock);

}



/** v4l2_ctrl_unlock() - Helper function to unlock the handler

  * associated with the control.

  * @ctrl:	The control to unlock.

  */

static inline void v4l2_ctrl_unlock(struct v4l2_ctrl *ctrl)

{

	mutex_unlock(ctrl->handler->lock);

}



/** v4l2_ctrl_notify() - Function to set a notify callback for a control.

  * @ctrl:	The control.

  * @notify:	The callback function.