mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
media: v4l2-subdev: get rid of __V4L2_SUBDEV_MK_GET_TRY() macro
X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com media: v4l2-subdev: get rid of __V4L2_SUBDEV_MK_GET_TRY() macro The __V4L2_SUBDEV_MK_GET_TRY() macro is used to define 3 functions that have the same arguments. The code of those functions is simple enough to just declare them, de-obfuscating the code. While here, replace BUG_ON() by WARN_ON() as there's no reason why to panic the Kernel if this fails. Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
39ad07b7de
commit
ab9bb73a06
1 changed files with 28 additions and 12 deletions
|
@ -890,19 +890,35 @@ struct v4l2_subdev_fh {
|
|||
container_of(fh, struct v4l2_subdev_fh, vfh)
|
||||
|
||||
#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
|
||||
#define __V4L2_SUBDEV_MK_GET_TRY(rtype, fun_name, field_name) \
|
||||
static inline struct rtype * \
|
||||
fun_name(struct v4l2_subdev *sd, \
|
||||
struct v4l2_subdev_pad_config *cfg, \
|
||||
unsigned int pad) \
|
||||
{ \
|
||||
BUG_ON(pad >= sd->entity.num_pads); \
|
||||
return &cfg[pad].field_name; \
|
||||
}
|
||||
static inline struct v4l2_mbus_framefmt
|
||||
*v4l2_subdev_get_try_format(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev_pad_config *cfg,
|
||||
unsigned int pad)
|
||||
{
|
||||
if (WARN_ON(pad >= sd->entity.num_pads))
|
||||
pad = 0;
|
||||
return &cfg[pad].try_fmt;
|
||||
}
|
||||
|
||||
__V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, v4l2_subdev_get_try_format, try_fmt)
|
||||
__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, v4l2_subdev_get_try_crop, try_crop)
|
||||
__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, v4l2_subdev_get_try_compose, try_compose)
|
||||
static inline struct v4l2_rect
|
||||
*v4l2_subdev_get_try_crop(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev_pad_config *cfg,
|
||||
unsigned int pad)
|
||||
{
|
||||
if (WARN_ON(pad >= sd->entity.num_pads))
|
||||
pad = 0;
|
||||
return &cfg[pad].try_crop;
|
||||
}
|
||||
|
||||
static inline struct v4l2_rect
|
||||
*v4l2_subdev_get_try_compose(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev_pad_config *cfg,
|
||||
unsigned int pad)
|
||||
{
|
||||
if (WARN_ON(pad >= sd->entity.num_pads))
|
||||
pad = 0;
|
||||
return &cfg[pad].try_compose;
|
||||
}
|
||||
#endif
|
||||
|
||||
extern const struct v4l2_file_operations v4l2_subdev_fops;
|
||||
|
|
Loading…
Reference in a new issue