Messages in this thread | | | From | Prabhakar Lad <> | Date | Mon, 17 Nov 2014 10:56:31 +0000 | Subject | Re: [PATCH] media: v4l2-subdev.h: drop the guard CONFIG_VIDEO_V4L2_SUBDEV_API for v4l2_subdev_get_try_*() |
| |
Hi Sakari,
On Mon, Nov 17, 2014 at 10:53 AM, Sakari Ailus <sakari.ailus@linux.intel.com> wrote: > Hi Prabhakar, > > Thank you for the patch. > > Lad, Prabhakar wrote: >> >> this patch removes the guard CONFIG_VIDEO_V4L2_SUBDEV_API >> for v4l2_subdev_get_try_*() functions. >> In cases where a subdev using v4l2_subdev_get_try_*() calls >> internally and the bridge using subdev pad ops which is >> not MC aware forces to select MEDIA_CONTROLLER, as >> VIDEO_V4L2_SUBDEV_API is dependent on it. >> >> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> >> --- >> include/media/v4l2-subdev.h | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h >> index 5860292..076ca11 100644 >> --- a/include/media/v4l2-subdev.h >> +++ b/include/media/v4l2-subdev.h >> @@ -642,7 +642,6 @@ struct v4l2_subdev_fh { >> #define to_v4l2_subdev_fh(fh) \ >> container_of(fh, struct v4l2_subdev_fh, vfh) >> >> -#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) > > > Wouldn't you need to drop these from struct v4l2_subdev_fh as well? The code > won't compile if the fields aren't there. > Ah missed it, thanks for the catch!
Thanks, --Prabhakar Lad
>> #define __V4L2_SUBDEV_MK_GET_TRY(rtype, fun_name, field_name) \ >> static inline struct rtype * \ >> v4l2_subdev_get_try_##fun_name(struct v4l2_subdev_fh *fh, \ >> @@ -656,7 +655,6 @@ struct v4l2_subdev_fh { >> __V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, format, try_fmt) >> __V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, crop, try_crop) >> __V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, compose, try_compose) >> -#endif >> >> extern const struct v4l2_file_operations v4l2_subdev_fops; >> >> > > -- > Kind regards, > > Sakari Ailus > sakari.ailus@linux.intel.com
| |