From: Sakari Ailus Date: Thu, 2 Oct 2025 10:32:54 +0000 (+0300) Subject: media: v4l2-dev: Make macros to obtain containers const-aware X-Git-Tag: v6.19-rc1~159^2~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68871116f961532910ccb97b6f437acf7e00548c;p=thirdparty%2Fkernel%2Flinux.git media: v4l2-dev: Make macros to obtain containers const-aware Retain the constness of the object in media_entity_to_video_device() and to_video_device(), by switching to container_of_const(). Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil --- diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index a213c3398dcf6..2e0f6d2e6a786 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -320,8 +320,8 @@ struct video_device { typeof(__entity) __me_vdev_ent = __entity; \ \ __me_vdev_ent ? \ - container_of(__me_vdev_ent, struct video_device, entity) : \ - NULL; \ + container_of_const(__me_vdev_ent, struct video_device, \ + entity) : NULL; \ }) /** @@ -330,7 +330,7 @@ struct video_device { * * @cd: pointer to &struct device */ -#define to_video_device(cd) container_of(cd, struct video_device, dev) +#define to_video_device(cd) container_of_const(cd, struct video_device, dev) /** * __video_register_device - register video4linux devices